Track API changes

All services are now referenced from the IdeServices class

116 files changed, 308 insertions, 312 deletions

diff --git a/main/src/addins/AspNet/Commands/AddViewDialog.cs b/main/src/addins/AspNet/Commands/AddViewDialog.cs
index 4f107b31f5..071ca00426 100644
--- a/main/src/addins/AspNet/Commands/AddViewDialog.cs
+++ b/main/src/addins/AspNet/Commands/AddViewDialog.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // AddViewDialog.cs
 //  
 // Author:
@@ -369,7 +369,7 @@ namespace MonoDevelop.AspNet.Commands
 			if (!File.Exists (realPath))
 				return;
 			
-			var pd = await TypeSystemService.ParseFile (project, realPath) as WebFormsParsedDocument;
+			var pd = await IdeApp.TypeSystemService.ParseFile (project, realPath) as WebFormsParsedDocument;
 			
 			if (pd != null) {
 				try {
@@ -479,7 +479,7 @@ namespace MonoDevelop.AspNet.Commands
 			public async Task GetTypes (MonoDevelop.Projects.DotNetProject project)
 			{

 				TypeNamesList = new List<string> ();
-				var ctx = await TypeSystemService.GetCompilationAsync (project);
+				var ctx = await IdeApp.TypeSystemService.GetCompilationAsync (project);
 				TypesList = new List<INamedTypeSymbol> (ctx.GetAllTypesInMainAssembly ());

 				foreach (var typeDef in TypesList) {

 					TypeNamesList.Add (Ambience.EscapeText (typeDef.ToDisplayString (SymbolDisplayFormat.CSharpErrorMessageFormat)));
diff --git a/main/src/addins/AspNet/Execution/BrowserLauncher.cs b/main/src/addins/AspNet/Execution/BrowserLauncher.cs
index 628b4cdd00..54f4bc1728 100644
--- a/main/src/addins/AspNet/Execution/BrowserLauncher.cs
+++ b/main/src/addins/AspNet/Execution/BrowserLauncher.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // BrowserLauncher.cs
 // 
 // Author:
@@ -38,7 +38,7 @@ namespace MonoDevelop.AspNet.Execution
 		public static ProcessAsyncOperation LaunchDefaultBrowser (string url)
 		{
 			try {
-				DesktopService.ShowUrl (url);
+				IdeServices.DesktopService.ShowUrl (url);
 				return NullProcessAsyncOperation.Success;
 			} catch (Exception ex) {
 				MessageService.ShowError (GettextCatalog.GetString ("Error launching web browser"), ex.ToString ());
diff --git a/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs b/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs
index 852c7dee79..08133edf1d 100644
--- a/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs
+++ b/main/src/addins/AspNet/Projects/AspNetAppProjectFlavor.cs
@@ -1,4 +1,4 @@
-//
+//
 // AspNetAppProject.cs: ASP.NET "Web Application" project type
 //
 // Authors:
@@ -704,7 +704,7 @@ namespace MonoDevelop.AspNet.Projects
 		protected override IEnumerable<ExecutionTarget> OnGetExecutionTargets (ConfigurationSelector configuration)
 		{
 			var apps = new List<ExecutionTarget> ();
-			foreach (var browser in MonoDevelop.Ide.DesktopService.GetApplications ("test.html")) {
+			foreach (var browser in MonoDevelop.Ide.IdeServices.DesktopService.GetApplications ("test.html")) {
 				if (browser.IsDefault)
 					apps.Insert (0, new BrowserExecutionTarget (browser.Id,browser.DisplayName,browser));
 				else
diff --git a/main/src/addins/AspNet/Razor/RazorCSharpParser.cs b/main/src/addins/AspNet/Razor/RazorCSharpParser.cs
index 0494d21402..421a6492a7 100644
--- a/main/src/addins/AspNet/Razor/RazorCSharpParser.cs
+++ b/main/src/addins/AspNet/Razor/RazorCSharpParser.cs
@@ -443,16 +443,16 @@ namespace MonoDevelop.AspNet.Razor
 			context.CSharpCode = CreateCodeFile (context);
 			context.ParsedSyntaxTree = CSharpSyntaxTree.ParseText (Microsoft.CodeAnalysis.Text.SourceText.From (context.CSharpCode));
 
-			var originalProject = TypeSystemService.GetCodeAnalysisProject (context.Project);
+			var originalProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (context.Project);
 			if (originalProject != null) {
 				string fileName = context.FileName + ".g.cs";
-				var documentId = TypeSystemService.GetDocumentId (originalProject.Id, fileName);
+				var documentId = IdeApp.TypeSystemService.GetDocumentId (originalProject.Id, fileName);
 				if (documentId == null) {
 					context.AnalysisDocument = originalProject.AddDocument (
 						fileName,
 						context.ParsedSyntaxTree?.GetRoot ());
 				} else {
-					context.AnalysisDocument = TypeSystemService.GetCodeAnalysisDocument (documentId);
+					context.AnalysisDocument = IdeApp.TypeSystemService.GetCodeAnalysisDocument (documentId);
 				}
 			}
 		}
diff --git a/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs b/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
index 12f658bb6b..dbf81d400e 100644
--- a/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
+++ b/main/src/addins/AspNet/WebForms/MasterContentFileDescriptionTemplate.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // MasterContentFileDescriptionTemplate.cs
 //  
 // Author:
@@ -27,7 +27,7 @@
 using System;
 using System.Collections.Generic;
 using MonoDevelop.Core;
-using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
 using MonoDevelop.Projects;
 using MonoDevelop.AspNet.Projects;
 using MonoDevelop.AspNet.WebForms.Parser;
@@ -69,7 +69,7 @@ namespace MonoDevelop.AspNet.WebForms
 			tags ["AspNetMaster"] = aspProj.LocalToVirtualPath (masterPage);
 			
 			try {
-				var pd = TypeSystemService.ParseFile (project, masterPage.FilePath).Result
+				var pd = IdeApp.TypeSystemService.ParseFile (project, masterPage.FilePath).Result
 						as WebFormsParsedDocument;
 				if (pd == null)
 					return;
diff --git a/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs b/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs
index c26b4b7ab6..0936c5b500 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsCodeBehind.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // CodeBehind.cs:
 //
 // Authors:
@@ -41,6 +41,7 @@ using MonoDevelop.Ide.TypeSystem;
 using MonoDevelop.Projects;
 using MonoDevelop.AspNet.Projects;
 using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -75,8 +76,7 @@ namespace MonoDevelop.AspNet.WebForms
 			var result = new BuildResult ();
 
 			//parse the ASP.NET file
-			var parsedDocument = TypeSystemService.ParseFile (project, file.FilePath).Result as WebFormsParsedDocument;
-			if (parsedDocument == null) {
+			if (!(IdeApp.TypeSystemService.ParseFile (project, file.FilePath).Result is WebFormsParsedDocument parsedDocument)) {
 				result.AddError (GettextCatalog.GetString ("Failed to parse file '{0}'", file.Name));
 				return result;
 			}
@@ -155,7 +155,7 @@ namespace MonoDevelop.AspNet.WebForms
 					ProjectFile resolvedMaster = ext.ResolveVirtualPath (document.Info.MasterPageTypeVPath, document.FileName);
 					WebFormsParsedDocument masterParsedDocument = null;
 					if (resolvedMaster != null)
-						masterParsedDocument = TypeSystemService.ParseFile (project, resolvedMaster.FilePath).Result as WebFormsParsedDocument;
+						masterParsedDocument = IdeApp.TypeSystemService.ParseFile (project, resolvedMaster.FilePath).Result as WebFormsParsedDocument;
 					if (masterParsedDocument != null && !String.IsNullOrEmpty (masterParsedDocument.Info.InheritedClass))
 						masterTypeName = masterParsedDocument.Info.InheritedClass;
 				} catch (Exception ex) {
diff --git a/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs b/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
index 4e998fe458..3c71dc3311 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsCodeBehindTypeNameCache.cs
@@ -1,4 +1,4 @@
-//

+//

 // CodeBehindTypeNameCache.cs

 //

 // Author:

@@ -46,7 +46,7 @@ namespace MonoDevelop.AspNet.WebForms
 		protected override string GenerateInfo (string filename)
 		{
 			try {
-				var doc = TypeSystemService.ParseFile (null, filename, DesktopService.GetMimeTypeForUri (filename), StringTextSource.ReadFrom (filename)).Result as WebFormsParsedDocument;
+				var doc = IdeApp.TypeSystemService.ParseFile (null, filename, IdeServices.DesktopService.GetMimeTypeForUri (filename), StringTextSource.ReadFrom (filename)).Result as WebFormsParsedDocument;
 				if (doc != null && !string.IsNullOrEmpty (doc.Info.InheritedClass))
 					return doc.Info.InheritedClass;
 			} catch (Exception ex) {
diff --git a/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs b/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs
index 894620927c..8d92348dca 100644
--- a/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs
+++ b/main/src/addins/AspNet/WebForms/WebFormsTypeContext.cs
@@ -1,4 +1,4 @@
-//
+//
 // DocumentReferenceManager.cs: Handles web type lookups for ASP.NET documents.
 //
 // Authors:
@@ -47,6 +47,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using System.Threading;
 using System.Threading.Tasks;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.AspNet.WebForms
 {
@@ -382,7 +383,7 @@ namespace MonoDevelop.AspNet.WebForms
 			var references = new HashSet<MetadataReference> ();
 
 			if (project != null) {
-				var result = await TypeSystemService.GetCompilationAsync (project, token);
+				var result = await IdeApp.TypeSystemService.GetCompilationAsync (project, token);
 				if (result != null)
 					references.Add (result.ToMetadataReference ());
 			}
@@ -439,7 +440,7 @@ namespace MonoDevelop.AspNet.WebForms
 						var p = reference.ResolveProject (project.ParentSolution) as DotNetProject;
 						if (p == null)
 							continue;
-						var result = await TypeSystemService.GetCompilationAsync (p);
+						var result = await IdeApp.TypeSystemService.GetCompilationAsync (p);
 						if (result != null) {
 							return result.ToMetadataReference ();
 						}
@@ -452,7 +453,7 @@ namespace MonoDevelop.AspNet.WebForms
 
 		MetadataReference LoadMetadataReference (string path)
 		{
-			var roslynProject = TypeSystemService.GetProject (Project);
+			var roslynProject = IdeApp.TypeSystemService.GetProject (Project);
 			var workspace = (MonoDevelopWorkspace)roslynProject.Solution.Workspace;
 			var reference = workspace.MetadataReferenceManager.GetOrCreateMetadataReferenceSnapshot (path, MetadataReferenceProperties.Assembly);
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
index e17aa98492..d4f471de04 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
@@ -1,4 +1,4 @@
-//
+//
 // ClassOutlineTextEditorExtension.cs
 //
 // Author:
@@ -113,7 +113,7 @@ namespace MonoDevelop.CSharp.ClassOutline
 			outlineTreeModelSort = new TreeModelSort (outlineTreeStore);
 			
 			settings = OutlineSettings.Load ();
-			comparer = new OutlineNodeComparer (new AstAmbience (TypeSystemService.Workspace.Options), settings, outlineTreeModelSort);
+			comparer = new OutlineNodeComparer (new AstAmbience (IdeApp.TypeSystemService.Workspace.Options), settings, outlineTreeModelSort);
 
 			outlineTreeModelSort.SetSortFunc (0, comparer.CompareNodes);
 			outlineTreeModelSort.SetSortColumnId (0, SortType.Ascending);
@@ -192,7 +192,7 @@ namespace MonoDevelop.CSharp.ClassOutline
 				using (var dialog = new OutlineSortingPreferencesDialog (settings)) {
 					if (MonoDevelop.Ide.MessageService.ShowCustomDialog (dialog) == (int)Gtk.ResponseType.Ok) {
 						dialog.SaveSettings ();
-						comparer = new OutlineNodeComparer (new AstAmbience (TypeSystemService.Workspace.Options), settings, outlineTreeModelSort);
+						comparer = new OutlineNodeComparer (new AstAmbience (IdeApp.TypeSystemService.Workspace.Options), settings, outlineTreeModelSort);
 						UpdateSorting ();
 					}
 				}
@@ -245,7 +245,7 @@ namespace MonoDevelop.CSharp.ClassOutline
 
 		static void OutlineTreeTextFunc (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
 		{
-			var astAmbience = new AstAmbience (TypeSystemService.Workspace.Options);
+			var astAmbience = new AstAmbience (IdeApp.TypeSystemService.Workspace.Options);
 			var txtRenderer = (CellRendererText)cell;
 			object o = model.GetValue (iter, 0);
 			var syntaxNode = o as SyntaxNode;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs
index 5759abcfda..15394c220b 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/CodeGenerationOptions.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // CodeGenerationOptions.cs
 //  
 // Author:
@@ -88,7 +88,7 @@ namespace MonoDevelop.CodeGeneration
 		{
 			get
 			{
-				return DesktopService.GetMimeTypeForUri (DocumentContext.Name);
+				return IdeServices.DesktopService.GetMimeTypeForUri (DocumentContext.Name);
 			}
 		}
 
@@ -135,7 +135,7 @@ namespace MonoDevelop.CodeGeneration
 		public async Task<string> OutputNode (SyntaxNode node, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			var options = await DocumentContext.GetOptionsAsync (cancellationToken);
-			node = Formatter.Format (node, TypeSystemService.Workspace, options, cancellationToken);
+			node = Formatter.Format (node, IdeApp.TypeSystemService.Workspace, options, cancellationToken);
 
 			var text = Editor.Text;
 			string nodeText = node.ToString ();
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs
index 7a16325db0..eff78dbfda 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.CodeGeneration/GenerateCodeWindow.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // GenerateCodeWindow.cs
 //  
 // Author:
@@ -138,7 +138,7 @@ namespace MonoDevelop.CodeGeneration
 			GetSize (out w, out h);
 			
 			int myMonitor = Screen.GetMonitorAtPoint (x, y);
-			Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, myMonitor);
+			Xwt.Rectangle geometry = IdeServices.DesktopService.GetUsableMonitorGeometry (Screen.Number, myMonitor);
 
 			if (x + w > geometry.Right)
 				x = (int)geometry.Right - w;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
index 614772c1a5..1835f10242 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
@@ -109,7 +109,7 @@ namespace MonoDevelop.CSharp.Completion
 		public CSharpFormattingPolicy FormattingPolicy {
 			get {
 				if (policy == null) {
-					IEnumerable<string> types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
+					IEnumerable<string> types = MonoDevelop.Ide.IdeServices.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
 					policy = DocumentContext.GetPolicy<CSharpFormattingPolicy> (types);
 				}
 				return policy;
@@ -133,7 +133,7 @@ namespace MonoDevelop.CSharp.Completion
 		/// Used in testing environment.
 		/// </summary>
 		[System.ComponentModel.Browsable (false)]
-		public CSharpCompletionTextEditorExtension (MonoDevelop.Ide.Gui.Document doc, bool addEventHandlersInInitialization = true)
+		public CSharpCompletionTextEditorExtension (Ide.Gui.RoslynDocumentContext doc, bool addEventHandlersInInitialization = true)
 		{
 			this.addEventHandlersInInitialization = addEventHandlersInInitialization;
 			Initialize (doc.Editor, doc);
@@ -700,7 +700,7 @@ namespace MonoDevelop.CSharp.Completion
 		}
 
 		internal static Lazy<ImmutableArray<ISignatureHelpProvider>> signatureProviders = new Lazy<ImmutableArray<ISignatureHelpProvider>> (() => {
-			var workspace = TypeSystemService.Workspace;
+			var workspace = IdeApp.TypeSystemService.Workspace;
 			var mefExporter = (IMefHostExportProvider)workspace.Services.HostServices;
 			var helpProviders = mefExporter.GetExports<ISignatureHelpProvider, LanguageMetadata> ()
 				.FilterToSpecificLanguage (LanguageNames.CSharp);
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs
index e183311318..82876359b6 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/ImportSymbolCompletionData.cs
@@ -1,4 +1,4 @@
-//
+//
 // ImportSymbolCompletionData.cs
 //
 // Author:
@@ -37,6 +37,7 @@ using MonoDevelop.Ide.Editor.Highlighting;
 using MonoDevelop.Ide.Fonts;
 using System.Linq;
 using Microsoft.CodeAnalysis.Shared.Utilities;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.CSharp.Completion
 {
@@ -217,7 +218,7 @@ namespace MonoDevelop.CSharp.Completion
 			} else {
 				markup.AppendTaggedText (theme, taggedParts.Take (i));
 				markup.Append ("<span font='");
-				markup.Append (FontService.SansFontName);
+				markup.Append (IdeServices.FontService.SansFontName);
 				markup.Append ("' size='small'>");
 				markup.AppendLine ();
 				markup.AppendLine ();
@@ -227,7 +228,7 @@ namespace MonoDevelop.CSharp.Completion
 			markup.AppendLine ();
 			markup.AppendLine ();
 			markup.Append ("<span font='");
-			markup.Append (FontService.SansFontName);
+			markup.Append (IdeServices.FontService.SansFontName);
 			markup.Append ("' size='small'>");
 			markup.AppendLine (GettextCatalog.GetString ("Note: creates an using for namespace:"));
 			markup.Append ("<b>");
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
index b0ede48cdd..c8e99eb7d9 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // CSharpFormattingProfileDialog.cs
 //  
 // Author:
@@ -666,7 +666,7 @@ namespace MonoDevelop.CSharp.Formatting
 				text = "";
 			}
 
-			var types = DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
+			var types = IdeServices.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
 			var textPolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types);
 
 			texteditor.Text = CSharpFormatter.FormatText (profile.CreateOptions (textPolicy), text, 0, text.Length);
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
index b86f5c234f..fb767402d0 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
@@ -1,4 +1,4 @@
-//
+//
 // CSharpTextEditorIndentation.cs
 //
 // Author:
@@ -58,7 +58,7 @@ namespace MonoDevelop.CSharp.Formatting
 		internal ICSharpCode.NRefactory6.CSharp.CacheIndentEngine stateTracker;
 		int cursorPositionBeforeKeyPress;
 
-		readonly static IEnumerable<string> types = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
+		readonly static IEnumerable<string> types = IdeServices.DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
 
 		char lastCharInserted;
 
@@ -842,7 +842,7 @@ namespace MonoDevelop.CSharp.Formatting
 		public void FormatBuffer ()
 		{
 			Console.WriteLine ("format buffer!");
-			ITypeResolveContext dom = TypeSystemService.GetProjectDom (Document.Project);
+			ITypeResolveContext dom = IdeApp.TypeSystemService.GetProjectDom (Document.Project);
 			OnTheFlyFormatter.Format (this.textEditorData, dom);
 		}*/
 	}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormattingPanel.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormattingPanel.cs
index e9eb0bfdae..989829d728 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormattingPanel.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/OnTheFlyFormattingPanel.cs
@@ -37,6 +37,7 @@ using MonoDevelop.Ide.TypeSystem;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis;
 using System;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.SourceEditor.OptionPanels
 {
@@ -71,7 +72,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 
 			public OnTheFlyFormattingPanelWidget ()
 			{
-				OptionService = TypeSystemService.Workspace.Services.GetService<IOptionService> ();
+				OptionService = IdeApp.TypeSystemService.Workspace.Services.GetService<IOptionService> ();
 				formatOnTypeCheckBox = new CheckBox (GettextCatalog.GetString ("Automatically format when typing"));
 				formatOnTypeCheckBox.Active = OptionService.GetOption (FeatureOnOffOptions.AutoFormattingOnTyping, LanguageNames.CSharp);
 				formatOnTypeCheckBox.Toggled += FormatOnTypeCheckBox_Toggled;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
index 702d6013c4..a8c7f2c205 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
@@ -87,7 +87,7 @@ namespace MonoDevelop.CSharp.Highlighting
 			}
 			var old = Editor.SyntaxHighlighting as TagBasedSyntaxHighlighting;
 			if (old == null) {
-				Editor.SyntaxHighlighting = CompositionManager.GetExportedValue<ITagBasedSyntaxHighlightingFactory> ().CreateSyntaxHighlighting (Editor.TextView, "source.cs");
+				Editor.SyntaxHighlighting = CompositionManager.Instance.GetExportedValue<ITagBasedSyntaxHighlightingFactory> ().CreateSyntaxHighlighting (Editor.TextView, "source.cs");
 			}
 		}
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs
index fc4b40b1c8..e5a564c44c 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.OptionProvider/CSharpDocumentOptionsProvider.cs
@@ -48,7 +48,7 @@ namespace MonoDevelop.CSharp.OptionProvider
 			var mdws = document.Project.Solution.Workspace as MonoDevelopWorkspace;
 			var project = mdws?.GetMonoProject (document.Project.Id);
 
-			var types = Ide.DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
+			var types = Ide.IdeServices.DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
 
 			CSharpFormattingPolicy policy;
 			TextStylePolicy textpolicy;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
index 8ac0e2c89d..9d0b4728bd 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // TypeSystemParser.cs
 //  
 // Author:
@@ -33,6 +33,7 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis;
 using System.Threading.Tasks;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.CSharp.Parser
 {
@@ -56,9 +57,9 @@ namespace MonoDevelop.CSharp.Parser
 			if (project != null) {
 				var curDoc = options.RoslynDocument;
 				if (curDoc == null) {
-					var curProject = TypeSystemService.GetCodeAnalysisProject (project);
+					var curProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (project);
 					if (curProject != null) {
-						var documentId = TypeSystemService.GetDocumentId (project, fileName);
+						var documentId = IdeApp.TypeSystemService.GetDocumentId (project, fileName);
 						if (documentId != null)
 							curDoc = curProject.GetDocument (documentId);
 					}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
index eecaeb2247..4b12ce6b09 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
@@ -1,4 +1,4 @@
-//
+//
 // CSharpCompilerParameters.cs
 //
 // Author:
@@ -35,6 +35,7 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Host;
 using MonoDevelop.Core;
 using MonoDevelop.Core.Serialization;
+using MonoDevelop.Ide;
 using MonoDevelop.Projects;
 
 namespace MonoDevelop.CSharp.Project
@@ -127,7 +128,7 @@ namespace MonoDevelop.CSharp.Project
 		public override CompilationOptions CreateCompilationOptions ()
 		{
 			var project = (CSharpProject)ParentProject;
-			var workspace = Ide.TypeSystem.TypeSystemService.GetWorkspace (project.ParentSolution);
+			var workspace = IdeApp.TypeSystemService.GetWorkspace (project.ParentSolution);
 			var metadataReferenceResolver = CreateMetadataReferenceResolver (
 					workspace.Services.GetService<IMetadataService> (),
 					project.BaseDirectory,
@@ -162,7 +163,7 @@ namespace MonoDevelop.CSharp.Project
 			foreach (var warning in GetSuppressedWarnings ())
 				result [warning] = ReportDiagnostic.Suppress;
 
-			var globalRuleSet = Ide.TypeSystem.TypeSystemService.RuleSetManager.GetGlobalRuleSet ();
+			var globalRuleSet = IdeApp.TypeSystemService.RuleSetManager.GetGlobalRuleSet ();
 			if (globalRuleSet != null) {
 				foreach (var kv in globalRuleSet.SpecificDiagnosticOptions) {
 					result [kv.Key] = kv.Value;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
index 3180358615..c913ccb999 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CompilerOptionsPanelWidget.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // CompilerOptionsPanelWidget.cs
 // 
 // Author:
@@ -231,7 +231,7 @@ namespace MonoDevelop.CSharp.Project
 		void FillClasses ()

 		{

 			try {
-				var ctx = TypeSystemService.GetCompilationAsync (project).Result;
+				var ctx = IdeApp.TypeSystemService.GetCompilationAsync (project).Result;
 				if (ctx == null)
 					// Project not found in parser database
 					return;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs
index e4d8895043..4d8767e966 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFeaturesTextEditorExtension.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // RenameTextEditorExtension.cs
 //  
 // Author:
@@ -47,7 +47,7 @@ namespace MonoDevelop.CSharp.Refactoring
 		static CSharpFeaturesTextEditorExtension ()
 		{
 			GoToDefinitionService.TryNavigateToSymbol = delegate (ISymbol symbol, Microsoft.CodeAnalysis.Project project, bool usePreviewTab) {
-				RefactoringService.RoslynJumpToDeclaration (symbol, TypeSystemService.GetMonoProject (project));
+				RefactoringService.RoslynJumpToDeclaration (symbol, IdeApp.TypeSystemService.GetMonoProject (project));
 				return true;
 			};
 
@@ -59,11 +59,11 @@ namespace MonoDevelop.CSharp.Refactoring
 				var offset = textSpan.Start;
 				string projectedName;
 				int projectedOffset;
-				if (TypeSystemService.GetWorkspace (TypeSystemService.GetMonoProject(project).ParentSolution).TryGetOriginalFileFromProjection (fileName, offset, out projectedName, out projectedOffset)) {
+				if (IdeApp.TypeSystemService.GetWorkspace (IdeApp.TypeSystemService.GetMonoProject(project).ParentSolution).TryGetOriginalFileFromProjection (fileName, offset, out projectedName, out projectedOffset)) {
 					fileName = projectedName;
 					offset = projectedOffset;
 				}
-				IdeApp.Workbench.OpenDocument (new FileOpenInformation (fileName, TypeSystemService.GetMonoProject (project)) {
+				IdeApp.Workbench.OpenDocument (new FileOpenInformation (fileName, IdeApp.TypeSystemService.GetMonoProject (project)) {
 					Offset = offset
 				});
 				return true;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferenceUsagesProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferenceUsagesProvider.cs
index e122884435..4ff5a22672 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferenceUsagesProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferenceUsagesProvider.cs
@@ -46,7 +46,7 @@ namespace MonoDevelop.CSharp.Refactoring
 				var currentProject = IdeApp.ProjectOperations.CurrentSelectedProject;
 				if (currentProject == null)
 					return;
-				var analysisProject = TypeSystemService.GetCodeAnalysisProject (currentProject);
+				var analysisProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (currentProject);
 				if (analysisProject == null)
 					return;
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs
index 2afc3b68ac..bd256c87ff 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpFindReferencesProvider.cs
@@ -1,4 +1,4 @@
-//
+//
 // CSharpFindReferencesProvider.cs
 //
 // Author:
@@ -118,7 +118,7 @@ namespace MonoDevelop.CSharp.Refactoring
 			LookupResult result = LookupResult.Failure;
 
 			if (hintProject != null) {
-				codeAnalysisHintProject = TypeSystemService.GetCodeAnalysisProject (hintProject);
+				codeAnalysisHintProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (hintProject);
 				if (codeAnalysisHintProject != null) {
 					var curResult = await TryLookupSymbolInProject (codeAnalysisHintProject, documentationCommentId, token);
 					if (curResult.Success) {
@@ -129,13 +129,13 @@ namespace MonoDevelop.CSharp.Refactoring
 			}
 			if (result.Success && result.Symbol.IsDefinedInSource ())
 				return result;
-			foreach (var ws in TypeSystemService.AllWorkspaces) {
+			foreach (var ws in IdeApp.TypeSystemService.AllWorkspaces) {
 				foreach (var prj in ws.CurrentSolution.Projects) {
 					if (prj == codeAnalysisHintProject)
 						continue;
 					var curResult = await TryLookupSymbolInProject (prj, documentationCommentId, token);
 					if (curResult.Success) {
-						curResult.MonoDevelopProject = TypeSystemService.GetMonoProject (prj);
+						curResult.MonoDevelopProject = IdeApp.TypeSystemService.GetMonoProject (prj);
 						if (curResult.Symbol.IsDefinedInSource ())
 							return curResult;
 						result = curResult;
@@ -209,7 +209,7 @@ namespace MonoDevelop.CSharp.Refactoring
 				if (lookup == null || !lookup.Success)
 					return;
 
-				var workspace = TypeSystemService.AllWorkspaces.FirstOrDefault (w => w.CurrentSolution == lookup.Solution) as MonoDevelopWorkspace;
+				var workspace = IdeApp.TypeSystemService.AllWorkspaces.FirstOrDefault (w => w.CurrentSolution == lookup.Solution) as MonoDevelopWorkspace;
 				if (workspace == null)
 					return;
 
@@ -233,7 +233,7 @@ namespace MonoDevelop.CSharp.Refactoring
 				var lookup = await TryLookupSymbol (documentationCommentId, hintProject, monitor.CancellationToken);
 				if (!lookup.Success)
 					return;
-				var workspace = TypeSystemService.AllWorkspaces.FirstOrDefault (w => w.CurrentSolution == lookup.Solution) as MonoDevelopWorkspace;
+				var workspace = IdeApp.TypeSystemService.AllWorkspaces.FirstOrDefault (w => w.CurrentSolution == lookup.Solution) as MonoDevelopWorkspace;
 				if (workspace == null)
 					return;
 				if (lookup.Symbol.Kind == SymbolKind.Method) {
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs
index bf8193b236..5f897a1eab 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/HelperMethods.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // HelperMethods.cs
 //  
 // Author:
@@ -90,7 +90,7 @@ namespace MonoDevelop.CSharp
 		internal static MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy GetFormattingPolicy (this DocumentContext doc)
 		{
 			var policyParent = doc?.Project?.Policies;
-			var types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
+			var types = MonoDevelop.Ide.IdeServices.DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
 			var codePolicy = policyParent != null ? policyParent.Get<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types) : MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			return codePolicy;
 		}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs
index f64f56e204..54968ba2a0 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs
@@ -85,7 +85,7 @@ namespace MonoDevelop.SourceEditor
 			var formatter = ctx.RoslynWorkspace.Services.GetLanguageServices (model.Language).GetService<IDocumentationCommentFormattingService> ();
 			var documentation = symbol.GetDocumentationParts (model, caretOffset, formatter, cancellationToken);
 			sb.Append ("<span font='");
-			sb.Append (FontService.SansFontName);
+			sb.Append (IdeServices.FontService.SansFontName);
 			sb.Append("' size='small'>");
 
 			if (documentation != null && documentation.Any ()) {
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs
index 8ddbd4399b..c06262560a 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.UnitTests/CSharpNUnitSourceCodeLocationFinder.cs
@@ -23,13 +23,10 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System;
 using MonoDevelop.UnitTesting;
-using MonoDevelop.Ide.TypeSystem;
-using System.Threading;
 using Microsoft.CodeAnalysis;
 using System.Linq;
-using MonoDevelop.Projects;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.CSharp.UnitTests
 {
@@ -37,7 +34,7 @@ namespace MonoDevelop.CSharp.UnitTests
 	{
 		public override async System.Threading.Tasks.Task<SourceCodeLocation> GetSourceCodeLocationAsync (MonoDevelop.Projects.Project project, string fixtureTypeNamespace, string fixtureTypeName, string testName, System.Threading.CancellationToken cancellationToken)
 		{
-			var ctx = await TypeSystemService.GetCompilationAsync (project, cancellationToken).ConfigureAwait (false);
+			var ctx = await IdeApp.TypeSystemService.GetCompilationAsync (project, cancellationToken).ConfigureAwait (false);
 			var cls = ctx?.Assembly?.GetTypeByMetadataName (string.IsNullOrEmpty (fixtureTypeNamespace) ? fixtureTypeName : fixtureTypeNamespace + "." + fixtureTypeName);
 			if (cls == null)
 				return null;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
index 3fc792ccb1..25a7535243 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
@@ -1,4 +1,4 @@
-//
+//
 // SignatureMarkupCreator.cs
 //
 // Author:
@@ -85,7 +85,7 @@ namespace MonoDevelop.CSharp
 			if (ctx != null) {
 				this.options = ctx.GetOptionSet ();
 			} else {
-				this.options = MonoDevelop.Ide.TypeSystem.TypeSystemService.Workspace.Options;
+				this.options = IdeApp.TypeSystemService.Workspace.Options;
 			}
 		}
 
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MonoDevelopContainedDocument.cs b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MonoDevelopContainedDocument.cs
index 080d9909c8..3fdf6de173 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MonoDevelopContainedDocument.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MonoDevelopContainedDocument.cs
@@ -77,7 +77,7 @@ namespace MonoDevelop.Ide.Completion.Presentation
 			DataBuffer = dataBuffer;

 			ContainedLanguageHost = containedLanguageHost;

 

-			_differenceSelectorService = CompositionManager.GetExportedValue<ITextDifferencingSelectorService> ();

+			_differenceSelectorService = CompositionManager.Instance.GetExportedValue<ITextDifferencingSelectorService> ();

 

 			var container = languageBuffer.CurrentSnapshot.AsText ().Container;

 			var registration = Workspace.GetWorkspaceRegistration (container);

@@ -601,7 +601,7 @@ namespace MonoDevelop.Ide.Completion.Presentation
 

 			var root = document.GetSyntaxRootSynchronously (CancellationToken.None);

 

-			var editorOptionsFactory = CompositionManager.GetExportedValue<IEditorOptionsFactoryService> ();

+			var editorOptionsFactory = CompositionManager.Instance.GetExportedValue<IEditorOptionsFactoryService> ();

 			var editorOptions = editorOptionsFactory.GetOptions (DataBuffer);

 			var options = _workspace.Options

 										.WithChangedOption (FormattingOptions.NewLine, root.Language, editorOptions.GetNewLineCharacter ())

@@ -708,7 +708,7 @@ namespace MonoDevelop.Ide.Completion.Presentation
 		private int GetBaseIndentation (SyntaxNode root, SourceText text, TextSpan span)

 		{

 			// Is this right?  We should probably get this from the IVsContainedLanguageHost instead.

-			var editorOptionsFactory = CompositionManager.GetExportedValue<IEditorOptionsFactoryService> ();

+			var editorOptionsFactory = CompositionManager.Instance.GetExportedValue<IEditorOptionsFactoryService> ();

 			var editorOptions = editorOptionsFactory.GetOptions (DataBuffer);

 

 			var additionalIndentation = GetAdditionalIndentation (root, text, span);

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs
index dc90bb5ca3..3de86b229c 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs
@@ -174,7 +174,7 @@ namespace MonoDevelop.Ide.Completion.Presentation
 			else {
 				markup.AppendTaggedText (theme, taggedParts.Take (i));
 				markup.Append ("<span font='");

-				markup.Append (FontService.SansFontName);

+				markup.Append (IdeServices.FontService.SansFontName);

 				markup.Append ("' size='small'>");
 				markup.AppendLine ();
 				markup.AppendLine ();
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCommandTarget.cs b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCommandTarget.cs
index 277808578b..b0de1928e7 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCommandTarget.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCommandTarget.cs
@@ -26,13 +26,13 @@ namespace MonoDevelop.Ide.Completion.Presentation
 

 		private RoslynCommandTarget (ITextView textView, ITextBuffer languageBuffer)

 		{

-			var commandHandlerServiceFactory = CompositionManager.GetExportedValue<ICommandHandlerServiceFactory> ();

+			var commandHandlerServiceFactory = CompositionManager.Instance.GetExportedValue<ICommandHandlerServiceFactory> ();

 			if (commandHandlerServiceFactory != null) {

 				commandHandlerServiceFactory.Initialize (languageBuffer.ContentType.TypeName);

 				CurrentRoslynHandlers = commandHandlerServiceFactory.GetService (languageBuffer);

 			}

 

-			var editorCommandHandlerServiceFactory = CompositionManager.GetExportedValue<IEditorCommandHandlerServiceFactory> ();

+			var editorCommandHandlerServiceFactory = CompositionManager.Instance.GetExportedValue<IEditorCommandHandlerServiceFactory> ();

 			if (editorCommandHandlerServiceFactory != null) {

 				CurrentEditorHandlers = editorCommandHandlerServiceFactory.GetService (textView, languageBuffer);

 			}

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCompletionPresenterSession.View.cs b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCompletionPresenterSession.View.cs
index 186b99e92d..952ffca7cd 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCompletionPresenterSession.View.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/RoslynCompletionPresenterSession.View.cs
@@ -1,4 +1,4 @@
-//
+//
 // RoslynCompletionPresenterSession.View.cs
 //
 // Author:
@@ -83,8 +83,8 @@ namespace MonoDevelop.Ide.Completion.Presentation
 			if (noMatchFont != null)
 				noMatchFont.Dispose ();
 
-			itemFont = FontService.MonospaceFont.Copy ();
-			noMatchFont = FontService.SansFont.CopyModified (Styles.FontScale11);
+			itemFont = IdeServices.FontService.MonospaceFont.Copy ();
+			noMatchFont = IdeServices.FontService.SansFont.CopyModified (Styles.FontScale11);
 
 			var newItemFontSize = itemFont.Size;
 			var newNoMatchFontSize = noMatchFont.Size;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs
index f9faf73db8..2456c2ef95 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.JSon/JSonTextEditorExtension.cs
@@ -46,13 +46,13 @@ namespace MonoDevelop.JSon
 
 			// This extension needs to be turned off if the webtooling addin json extension is present.
 			//   That addin defines a "text/x-json" mimeType that has multiple levels of inheritance.
-			var mimeChain = DesktopService.GetMimeTypeInheritanceChain("text/x-json").ToList();
+			var mimeChain = IdeServices.DesktopService.GetMimeTypeInheritanceChain("text/x-json").ToList();
 			jsonExtensionInstalled = (mimeChain.Count > 2);
 
 			if (!jsonExtensionInstalled)

 			{

 				IStateMachineIndentEngine indentEngine;

-				indentEngine = new JSonIndentEngine(Editor, DocumentContext);

+				indentEngine = new JSonIndentEngine(Editor);

 				stateTracker = new CacheIndentEngine(indentEngine);

 				Editor.IndentationTracker = new JSonIndentationTracker(Editor, stateTracker);

 			}

diff --git a/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs b/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
index 46985bc20e..8611a4ee2b 100644
--- a/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
+++ b/main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
@@ -1,4 +1,4 @@
-// AddLogEntryDialog.cs
+// AddLogEntryDialog.cs
 //
 // Author:
 //   Lluis Sanchez Gual
@@ -47,7 +47,7 @@ namespace MonoDevelop.ChangeLogAddIn
 		{
 			Build ();
 			
-			textview.ModifyFont (FontService.MonospaceFont);
+			textview.ModifyFont (IdeServices.FontService.MonospaceFont);
 			textview.WrapMode = WrapMode.None;
 			textview.AcceptsTab = true;
 			Pango.TabArray tabs = new Pango.TabArray (1, true);
diff --git a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
index e272ee6c9b..9a877796cb 100644
--- a/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
+++ b/main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
@@ -112,7 +112,7 @@ namespace MonoDevelop.ChangeLogAddIn
 			var textBuffer = document.Editor;					
 			if (textBuffer == null) return false;
 			
-			AuthorInformation userInfo = document.Project != null ? document.Project.AuthorInformation : AuthorInformation.Default;
+			AuthorInformation userInfo = document.Owner is SolutionFolderItem item ? item.AuthorInformation : AuthorInformation.Default;
 			
 			if (!userInfo.IsValid) {
 				string title = GettextCatalog.GetString ("ChangeLog entries can't be generated");
@@ -163,7 +163,7 @@ namespace MonoDevelop.ChangeLogAddIn
 			if (File.Exists (clog))
 				return await IdeApp.Workbench.OpenDocument (clog, (Project) null, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer);
 			
-			Document document = IdeApp.Workbench.NewDocument (clog, "text/plain", "");
+			Document document = await IdeApp.Workbench.NewDocument (clog, "text/plain", "");
 			//it doesn't need to be saved to start using it
 			document.Save().Ignore ();
 			return document;				
diff --git a/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs
index b6eeaf6721..bfeadec001 100644
--- a/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs
+++ b/main/src/addins/MacPlatform/Dialogs/MacAddFileDialogHandler.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // MacSelectFileDialogHandler.cs
 //  
 // Author:
@@ -51,7 +51,7 @@ namespace MonoDevelop.MacIntegration
 		{
 			using (var panel = CreatePanel (data, out NSPopUpButton popup)) {
 				if (panel.RunModal () == 0) {
-					DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
+					IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
 					return false;
 				}
 				
@@ -61,7 +61,7 @@ namespace MonoDevelop.MacIntegration
 				if (idx >= 0)
 					data.OverrideAction = data.BuildActions[idx];
 
-				DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
+				IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
 				return true;
 			}
 		}
diff --git a/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs
index 4d5f508c9d..4295e92e49 100644
--- a/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs
+++ b/main/src/addins/MacPlatform/Dialogs/MacAlertDialogHandler.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // MacAlertFileDialogHandler.cs
 //  
 // Author:
@@ -187,7 +187,7 @@ namespace MonoDevelop.MacIntegration
 					var sheet = IdeTheme.UserInterfaceTheme != Theme.Dark || MacSystemInformation.OsVersion != MacSystemInformation.HighSierra;
 
 					// We have an issue with accessibility when using sheets, so disable it here
-					sheet &= !DesktopService.AccessibilityInUse;
+					sheet &= !IdeServices.DesktopService.AccessibilityInUse;
 
 					if (!sheet || nativeParent == null) {
 						// Force the alert window to be focused for accessibility
@@ -240,7 +240,7 @@ namespace MonoDevelop.MacIntegration
 				if (nativeParent != null)
 					nativeParent.MakeKeyAndOrderFront (nativeParent);
 				else
-					DesktopService.FocusWindow (parent);
+					IdeServices.DesktopService.FocusWindow (parent);
 
 			}
 
diff --git a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs
index 3bb885f020..9bb2ede4a0 100644
--- a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs
+++ b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // MacSelectFileDialogHandler.cs
 //  
 // Author:
@@ -108,7 +108,7 @@ namespace MonoDevelop.MacIntegration
 					};
 
 					if (panel.RunModal () == 0 && !pathAlreadySet) {
-						DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
+						IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
 						return false;
 					}
 					if (!pathAlreadySet)
@@ -124,7 +124,7 @@ namespace MonoDevelop.MacIntegration
 							state.CurrentViewers [(int)state.ViewerSelector.IndexOfSelectedItem] : null;
 					}
 
-					DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
+					IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
 				}
 			} catch (Exception ex) {
 				LoggingService.LogInternalError ("Error in Open File dialog", ex);
@@ -207,7 +207,7 @@ namespace MonoDevelop.MacIntegration
 			int i = 0;
 			bool hasWorkbenchViewer = false;
 
-			if (IdeApp.Services.ProjectService.IsWorkspaceItemFile (filename) || IdeApp.Services.ProjectService.IsSolutionItemFile (filename)) {
+			if (IdeServices.ProjectService.IsWorkspaceItemFile (filename) || IdeServices.ProjectService.IsSolutionItemFile (filename)) {
 				button.Menu.AddItem (new NSMenuItem { Title = GettextCatalog.GetString ("Solution Workbench") });
 				currentViewers.Add (null);
 				
@@ -220,7 +220,7 @@ namespace MonoDevelop.MacIntegration
 				i++;
 			}
 			
-			foreach (var vw in DisplayBindingService.GetFileViewers (filename, null)) {
+			foreach (var vw in IdeServices.DisplayBindingService.GetFileViewers (filename, null).Result) {
 				if (!vw.IsExternal) {
 					button.Menu.AddItem (new NSMenuItem { Title = vw.Title });
 					currentViewers.Add (vw);
diff --git a/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs
index 014a4e4fd8..a4f935fb76 100644
--- a/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs
+++ b/main/src/addins/MacPlatform/Dialogs/MacSelectFileDialogHandler.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // MacSelectFileDialogHandler.cs
 //  
 // Author:
@@ -61,12 +61,12 @@ namespace MonoDevelop.MacIntegration
 		{
 			using (var panel = CreatePanel (data, out var saveState)) {
 				if (panel.RunModal () == 0) {
-					DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
+					IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
 					return false;
 				}
 
 				data.SelectedFiles = GetSelectedFiles (panel);
-				DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
+				IdeServices.DesktopService.FocusWindow (data.TransientFor ?? MessageService.RootWindow);
 				return true;
 			}
 		}
@@ -105,9 +105,9 @@ namespace MonoDevelop.MacIntegration
 					return true;
 				
 				if (mimetypes != null) {
-					var mimetype = DesktopService.GetMimeTypeForUri (path);
+					var mimetype = IdeServices.DesktopService.GetMimeTypeForUri (path);
 					if (mimetype != null) {
-						var chain = DesktopService.GetMimeTypeInheritanceChain (mimetype);
+						var chain = IdeServices.DesktopService.GetMimeTypeInheritanceChain (mimetype);
 						if (mimetypes.Any (m => chain.Any (c => c == m)))
 							return true;
 					}
diff --git a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs
index 45bf387c14..a07bde11ef 100644
--- a/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs
+++ b/main/src/addins/MacPlatform/MainToolbar/StatusBar.cs
@@ -596,7 +596,7 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 			updateHandler = delegate {
 				int ec = 0, wc = 0;
 
-				foreach (var t in TaskService.Errors) {
+				foreach (var t in IdeServices.TaskService.Errors) {
 					if (t.Severity == TaskSeverity.Error)
 						ec++;
 					else if (t.Severity == TaskSeverity.Warning)
@@ -617,8 +617,8 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 			updateHandler (null, null);
 
-			TaskService.Errors.TasksAdded += updateHandler;
-			TaskService.Errors.TasksRemoved += updateHandler;
+			IdeServices.TaskService.Errors.TasksAdded += updateHandler;
+			IdeServices.TaskService.Errors.TasksRemoved += updateHandler;
 			BrandingService.ApplicationNameChanged += ApplicationNameChanged;
 
 			AddSubview (cancelButton);
@@ -666,8 +666,8 @@ namespace MonoDevelop.MacIntegration.MainToolbar
 
 		protected override void Dispose (bool disposing)
 		{
-			TaskService.Errors.TasksAdded -= updateHandler;
-			TaskService.Errors.TasksRemoved -= updateHandler;
+			IdeServices.TaskService.Errors.TasksAdded -= updateHandler;
+			IdeServices.TaskService.Errors.TasksRemoved -= updateHandler;
 			Ide.Gui.Styles.Changed -= LoadStyles;
 			BrandingService.ApplicationNameChanged -= ApplicationNameChanged;
 			base.Dispose (disposing);
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/PublishToFolderBaseCommandHandler.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/PublishToFolderBaseCommandHandler.cs
index e112767335..1c14b8eafa 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/PublishToFolderBaseCommandHandler.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/PublishToFolderBaseCommandHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.IO;
@@ -133,7 +133,7 @@ namespace MonoDevelop.AspNetCore.Commands
 			}
 
 			if (Directory.Exists (path))
-				DesktopService.OpenFolder (path);
+				IdeServices.DesktopService.OpenFolder (path);
 			else
 				LoggingService.LogError ("Trying to open {0} but it does not exists.", path);
 		}
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
index 8aa2b18a78..0cc0ca611e 100644
--- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
+++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore/AspNetCoreExecutionHandler.cs
@@ -101,7 +101,7 @@ namespace MonoDevelop.AspNetCore
 			}
 
 			// Process is still alive hence we succesfully connected inside loop to web server, launch browser
-			DesktopService.ShowUrl (launchUri.AbsoluteUri);
+			IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri);
 		}
 	}
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Cecil/MethodDefinitionNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Cecil/MethodDefinitionNodeBuilder.cs
index af8637f4d2..cd3e7a89a3 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Cecil/MethodDefinitionNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Cecil/MethodDefinitionNodeBuilder.cs
@@ -1,4 +1,4 @@
-//
+//
 // DomMethodNodeBuilder.cs
 //
 // Author:
@@ -172,7 +172,7 @@ namespace MonoDevelop.AssemblyBrowser
 
 		public static DecompilerSettings GetDecompilerSettings (TextEditor data, bool publicOnly = false)
 		{
-			var types = DesktopService.GetMimeTypeInheritanceChain (data.MimeType);
+			var types = IdeServices.DesktopService.GetMimeTypeInheritanceChain (data.MimeType);
 			var codePolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<MonoDevelop.CSharp.Formatting.CSharpFormattingPolicy> (types);
 			var settings = TypeDefinitionNodeBuilder.CreateDecompilerSettings (publicOnly, codePolicy);
 			return settings;
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Roslyn/ProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Roslyn/ProjectNodeBuilder.cs
index eb776c4a9d..3615f5c8c6 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Roslyn/ProjectNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/TreeNodes/Roslyn/ProjectNodeBuilder.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // ProjectNodeBuilder.cs
 //  
 // Author:
@@ -25,19 +25,13 @@
 // THE SOFTWARE.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-
-using Mono.Cecil;
-
 using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
+using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui.Components;
-using System.Collections.Generic;
-using System.IO;
-using MonoDevelop.Projects;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Projects;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -75,7 +69,7 @@ namespace MonoDevelop.AssemblyBrowser
 		{
 			Project project = (Project)dataObject;
 			bool publicOnly = Widget.PublicApiOnly;
-			var dom = TypeSystemService.GetCompilationAsync (project).Result;
+			var dom = IdeApp.TypeSystemService.GetCompilationAsync (project).Result;
 			if (dom == null)
 				return;
 			bool nestedNamespaces = builder.Options ["NestedNamespaces"];
diff --git a/main/src/addins/MonoDevelop.ConnectedServices/CodeDependency.cs b/main/src/addins/MonoDevelop.ConnectedServices/CodeDependency.cs
index a348358e9f..09434be1e9 100644
--- a/main/src/addins/MonoDevelop.ConnectedServices/CodeDependency.cs
+++ b/main/src/addins/MonoDevelop.ConnectedServices/CodeDependency.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -88,7 +88,7 @@ namespace MonoDevelop.ConnectedServices
 						LoggingService.LogInfo ("Adding code dependency '{0}' to '{1}'...", this, this.Service.Project.Name);
 					}
 
-					var compilation = await TypeSystemService.GetCompilationAsync (this.Service.Project).ConfigureAwait (false);
+					var compilation = await IdeApp.TypeSystemService.GetCompilationAsync (this.Service.Project).ConfigureAwait (false);
 
 					if (compilation == null) {
 						LoggingService.LogInternalError ("Could not get compilation object.", null);
@@ -128,7 +128,7 @@ namespace MonoDevelop.ConnectedServices
 						LoggingService.LogInfo ("Removing code dependency '{0}' from '{1}'...", this, this.Service.Project.Name);
 					}
 
-					var compilation = await TypeSystemService.GetCompilationAsync (this.Service.Project).ConfigureAwait (false);
+					var compilation = await IdeApp.TypeSystemService.GetCompilationAsync (this.Service.Project).ConfigureAwait (false);
 
 					if (compilation == null) {
 						LoggingService.LogInternalError ("Could not get compilation object.", null);
diff --git a/main/src/addins/MonoDevelop.ConnectedServices/CodeExtensions.cs b/main/src/addins/MonoDevelop.ConnectedServices/CodeExtensions.cs
index 44382cc0f3..17da306510 100644
--- a/main/src/addins/MonoDevelop.ConnectedServices/CodeExtensions.cs
+++ b/main/src/addins/MonoDevelop.ConnectedServices/CodeExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -8,6 +8,7 @@ using MonoDevelop.Core;
 using MonoDevelop.Projects.Text;
 using Microsoft.CodeAnalysis;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.ConnectedServices
 {
@@ -30,7 +31,7 @@ namespace MonoDevelop.ConnectedServices
 		/// </summary>
 		public static Microsoft.CodeAnalysis.Project GetCodeAnalysisProject (this MonoDevelop.Projects.Project monoDevelopProject)
 		{
-			return TypeSystemService.GetCodeAnalysisProject (monoDevelopProject);
+			return IdeApp.TypeSystemService.GetCodeAnalysisProject (monoDevelopProject);
 		}
 
 		/// <summary>
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs
index bdb43ae3f9..030282437d 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs
@@ -28,6 +28,7 @@ using MonoDevelop.Components;
 using Mono.Debugging.Client;
 using Gtk;
 using MonoDevelop.Ide.Fonts;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.Debugger.PreviewVisualizers
 {
@@ -68,7 +69,7 @@ namespace MonoDevelop.Debugger.PreviewVisualizers
 			
 			label = new Label ();
 			label.Text = value;
-			label.ModifyFont (FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11));
+			label.ModifyFont (IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11));
 			label.ModifyFg (StateType.Normal, col);
 			label.SetPadding (4, 4);
 
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
index 34b7907cd6..1b11cb9cab 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
@@ -71,7 +71,7 @@ namespace MonoDevelop.Debugger
 
 			var headerTitle = new Label ();
 			headerTitle.ModifyFg (StateType.Normal, Styles.PreviewVisualizerHeaderTextColor.ToGdkColor ());
-			var font = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12);
+			var font = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12);
 			font.Weight = Pango.Weight.Bold;
 			headerTitle.ModifyFont (font);
 			headerTitle.Text = val.TypeName;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
index 95244ddd75..57025d3dc2 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
@@ -1,4 +1,4 @@
-//
+//
 // BreakpointsPropertiesDialog.cs
 //
 // Author:
@@ -624,7 +624,7 @@ namespace MonoDevelop.Debugger
 
 				var project = IdeApp.ProjectOperations.CurrentSelectedProject;
 				if (project != null) {
-					var roslynProj = TypeSystemService.GetProject (project);
+					var roslynProj = IdeApp.TypeSystemService.GetProject (project);
 					if (roslynProj != null) {
 						workspace = (MonoDevelopWorkspace)roslynProj.Solution.Workspace;
 						compilation = await roslynProj.GetCompilationAsync ();
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index f852bfc07b..e4a233e40a 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -93,8 +93,8 @@ namespace MonoDevelop.Debugger
 		static DebuggingService ()
 		{
 			executionHandlerFactory = new DebugExecutionHandlerFactory ();
-			TextEditorService.LineCountChanged += OnLineCountChanged;
 			IdeApp.Initialized += delegate {
+				IdeServices.TextEditorService.LineCountChanged += OnLineCountChanged;
 				IdeApp.Workspace.StoringUserPreferences += OnStoreUserPrefs;
 				IdeApp.Workspace.LoadingUserPreferences += OnLoadUserPrefs;
 				IdeApp.Workspace.LastWorkspaceItemClosed += OnSolutionClosed;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
index d3d79b584e..dc24c1e85b 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
@@ -1,4 +1,4 @@
-//
+//
 // ExceptionCaughtDialog.cs
 //
 // Authors: Lluis Sanchez Gual <lluis@novell.com>
@@ -116,7 +116,7 @@ widget ""*.exception_help_link_label"" style ""exception-help-link-label""
 			var textColor = Styles.ExceptionCaughtDialog.HeaderTextColor.ToGdkColor ();
 
 			ExceptionHelpLinkLabel.ModifyBase (StateType.Prelight, Styles.ExceptionCaughtDialog.HeaderBackgroundColor.ToGdkColor ());
-			ExceptionHelpLinkLabel.SetLinkHandler ((str) => DesktopService.ShowUrl (str));
+			ExceptionHelpLinkLabel.SetLinkHandler ((str) => IdeServices.DesktopService.ShowUrl (str));
 			ExceptionTypeLabel.ModifyFg (StateType.Normal, textColor);
 			ExceptionMessageLabel.ModifyFg (StateType.Normal, textColor);
 			ExceptionHelpLinkLabel.ModifyFg (StateType.Normal, textColor);
@@ -431,7 +431,7 @@ widget ""*.exception_dialog_expander"" style ""exception-dialog-expander""
 			InnerExceptionHelpLinkLabel.CanFocus = false;
 			InnerExceptionHelpLinkLabel.Xalign = 0;
 			InnerExceptionHelpLinkLabel.ModifyFont (Pango.FontDescription.FromString (Platform.IsWindows ? "9" : "11"));
-			InnerExceptionHelpLinkLabel.SetLinkHandler ((str) => DesktopService.ShowUrl (str));
+			InnerExceptionHelpLinkLabel.SetLinkHandler ((str) => IdeServices.DesktopService.ShowUrl (str));
 
 			vboxAroundInnerExceptionMessage.PackStart (hbox, false, true, 0);
 			vboxAroundInnerExceptionMessage.PackStart (InnerExceptionMessageLabel, true, true, 10);
@@ -900,7 +900,7 @@ widget ""*.exception_dialog_expander"" style ""exception-dialog-expander""
 			}
 			if (button == null) {
 				button = new ExceptionCaughtButton (ex, this, File, Line);
-				TextEditorService.RegisterExtension (button);
+				IdeServices.TextEditorService.RegisterExtension (button);
 				button.ScrollToView ();
 			}
 			if (miniButton != null) {
@@ -922,7 +922,7 @@ widget ""*.exception_dialog_expander"" style ""exception-dialog-expander""
 			}
 			if (miniButton == null) {
 				miniButton = new ExceptionCaughtMiniButton (this, File, Line);
-				TextEditorService.RegisterExtension (miniButton);
+				IdeServices.TextEditorService.RegisterExtension (miniButton);
 				miniButton.ScrollToView ();
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs
index 8e5a2d7694..8bfca252ca 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs
@@ -59,7 +59,7 @@ namespace MonoDevelop.Debugger
 			}
 		}
 		
-		void OnFrameChanged (object s, EventArgs a)
+		async void OnFrameChanged (object s, EventArgs a)
 		{
 			if (disassemblyDoc != null && DebuggingService.IsFeatureSupported (DebuggerFeatures.Disassembly))
 				disassemblyView.Update ();
@@ -104,7 +104,7 @@ namespace MonoDevelop.Debugger
 				if (noSourceDoc == null) {
 					noSourceView = new NoSourceView ();
 					noSourceView.Update (disassemblyNotSupported);
-					noSourceDoc = IdeApp.Workbench.OpenDocument (noSourceView, true);
+					noSourceDoc = await IdeApp.Workbench.OpenDocument (noSourceView, true);
 					noSourceDoc.Closed += delegate {
 						noSourceDoc = null;
 						noSourceView = null;
@@ -118,11 +118,11 @@ namespace MonoDevelop.Debugger
 			}
 		}
 		
-		void OnShowDisassembly (object s, EventArgs a)
+		async void OnShowDisassembly (object s, EventArgs a)
 		{
 			if (disassemblyDoc == null) {
 				disassemblyView = new DisassemblyView ();
-				disassemblyDoc = IdeApp.Workbench.OpenDocument (disassemblyView, true);
+				disassemblyDoc = await IdeApp.Workbench.OpenDocument (disassemblyView, true);
 				disassemblyDoc.Closed += delegate {
 					disassemblyDoc = null;
 					disassemblyView = null;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
index 8a5fb4f50e..c2998c9c8b 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
@@ -1,4 +1,4 @@
-// ObjectValueTree.cs
+// ObjectValueTree.cs
 //
 // Author:
 //   Lluis Sanchez Gual <lluis@novell.com>
@@ -165,7 +165,7 @@ namespace MonoDevelop.Debugger
 				if (!icon.IsNull) {
 					using (var ctx = Gdk.CairoHelper.Create (window)) {
 						using (var layout = new Pango.Layout (widget.PangoContext)) {
-							layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
+							layout.FontDescription = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
 							layout.FontDescription.Family = Family;
 							layout.SetText (Text);
 							int w, h;
@@ -320,7 +320,7 @@ namespace MonoDevelop.Debugger
 			Selection.Changed += HandleSelectionChanged;
 			ResetColumnSizes ();
 
-			Pango.FontDescription newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
+			Pango.FontDescription newFont = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
 
 			liveIcon = ImageService.GetIcon ("md-live", IconSize.Menu);
 			noLiveIcon = liveIcon.WithAlpha (0.5);
@@ -769,11 +769,11 @@ namespace MonoDevelop.Debugger
 				compact = value;
 				Pango.FontDescription newFont;
 				if (compact) {
-					newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
+					newFont = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
 					valueCol.MaxWidth = 800;
 					crpViewer.Image = ImageService.GetIcon (Stock.Edit).WithSize (12,12);
 				} else {
-					newFont = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12);
+					newFont = IdeServices.FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale12);
 					valueCol.MaxWidth = int.MaxValue;
 				}
 				crtValue.Compact = compact;
@@ -1946,7 +1946,7 @@ namespace MonoDevelop.Debugger
 						Uri uri;
 						if (url != null && Uri.TryCreate (url, UriKind.Absolute, out uri) && (uri.Scheme == "http" || uri.Scheme == "https")) {
 							clickProcessed = true;
-							DesktopService.ShowUrl (url);
+							IdeServices.DesktopService.ShowUrl (url);
 						}
 					}
 				} else if (cr == crtExp) {
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs
index 5f7c6e4b34..6a08c70968 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectFileDescriptor.cs
@@ -1,4 +1,4 @@
-// ProjectFileDescriptor.cs

+// ProjectFileDescriptor.cs

 //

 //Author:

 //  Lluis Sanchez Gual

@@ -90,8 +90,8 @@ namespace MonoDevelop.DesignerSupport
 		[LocalizedDescription ("Type of the file.")]

 		public string FileType {

 			get {

-				string type = DesktopService.GetMimeTypeForUri (file.Name);

-				return DesktopService.GetMimeTypeDescription (type); 

+				string type = IdeServices.DesktopService.GetMimeTypeForUri (file.Name);

+				return IdeServices.DesktopService.GetMimeTypeDescription (type); 

 			}

 		}

 		

diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs
index e956cd6926..5d08cc734a 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/BindingService.cs
@@ -1,4 +1,4 @@
-//
+//
 // BindingService.cs: Utility methods for binding CodeBehind members.
 //
 // Authors:
@@ -167,7 +167,7 @@ namespace MonoDevelop.DesignerSupport
 //			if (!isChildClass)
 //				throw new ArgumentException ("Class specificPartToAffect is not a part of class cls");
 //			
-//			var dom = TypeSystemService.GetCompilation (project);
+//			var dom = IdeApp.TypeSystemService.GetCompilation (project);
 //			var existingMember = GetCompatibleMemberInClass (dom, cls, member);
 //			
 //			if (existingMember == null)
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs
index e3431daaa1..27d76ec90f 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/PropertyPadVisitor.cs
@@ -30,6 +30,7 @@ using System;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Gui.Shell;
 
 namespace MonoDevelop.DesignerSupport
 {
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependencyNodeCache.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependencyNodeCache.cs
index fa111f74bb..ce1b18f47e 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependencyNodeCache.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.NodeBuilders/PackageDependencyNodeCache.cs
@@ -88,7 +88,7 @@ namespace MonoDevelop.DotNetCore.NodeBuilders
 
 		Task<List<PackageDependencyInfo>> GetPackageDependenciesAsync (CancellationTokenSource tokenSource)
 		{
-			var configurationSelector = IdeApp.Workspace?.ActiveConfiguration ?? ConfigurationSelector.Default;
+			var configurationSelector = IdeApp.IsInitialized ? IdeApp.Workspace?.ActiveConfiguration ?? ConfigurationSelector.Default : ConfigurationSelector.Default;
 			return Task.Run (async () => {
 				var dependencies = await Project.GetPackageDependencies (configurationSelector, tokenSource.Token)
 					.ConfigureAwait (false);
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
index 27bce95a3a..7a51d6a7f7 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/MonoDevelop.DotNetCore.Tests/DotNetCoreProjectTemplateTests.cs
@@ -31,6 +31,8 @@ using MonoDevelop.Ide.Templates;
 using MonoDevelop.Projects;
 using NUnit.Framework;
 using IdeUnitTests;
+using MonoDevelop.Ide;
+using UnitTests;
 
 namespace MonoDevelop.DotNetCore.Tests
 {
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs
index ce712637c2..01f0858897 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreExecutionHandler.cs
@@ -101,7 +101,7 @@ namespace MonoDevelop.DotNetCore
 			}
 
 			// Process is still alive hence we succesfully connected inside loop to web server, launch browser
-			DesktopService.ShowUrl (launchUri.AbsoluteUri);
+			IdeServices.DesktopService.ShowUrl (launchUri.AbsoluteUri);
 		}
 	}
 }
\ No newline at end of file
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs
index 044b397e07..cb28b6edc9 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreNotInstalledDialog.cs
@@ -85,7 +85,7 @@ namespace MonoDevelop.DotNetCore
 		void AlertButtonClicked (object sender, AlertButtonEventArgs e)
 		{
 			if (e.Button == downloadButton)
-				DesktopService.ShowUrl (downloadUrl);
+				IdeServices.DesktopService.ShowUrl (downloadUrl);
 		}
 
 		public void Dispose ()
diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs
index 31b84eba34..b70088877a 100644
--- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs
+++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore/DotNetCoreProjectExtension.cs
@@ -624,7 +624,7 @@ namespace MonoDevelop.DotNetCore
 			if (Project.Loading)
 				return;
 
-			if (IdeApp.ProjectOperations == null)
+			if (!IdeApp.IsInitialized)
 				return;
 
 			if (IdeApp.ProjectOperations.CurrentSelectedSolution != Project.ParentSolution)
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
index 874f1cebd1..072e98b9c6 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
@@ -1,4 +1,4 @@
-//
+//
 // POEditorWidget.cs
 //
 // Author:
@@ -665,7 +665,7 @@ namespace MonoDevelop.Gettext
 							line = "?";
 						}
 						string fullName = System.IO.Path.Combine (System.IO.Path.GetDirectoryName (this.poFileName), file);
-						this.foundInStore.AppendValues (file, line, fullName, DesktopService.GetIconForFile (fullName, IconSize.Menu));
+						this.foundInStore.AppendValues (file, line, fullName, IdeServices.DesktopService.GetIconForFile (fullName, IconSize.Menu));
 					}
 				}
 				
@@ -974,7 +974,7 @@ namespace MonoDevelop.Gettext
 		
 		void ClearTasks ()
 		{
-			TaskService.Errors.ClearByOwner (this);
+			IdeServices.TaskService.Errors.ClearByOwner (this);
 		}
 		
 		static bool CompareTasks (List<TaskListEntry> list1, List<TaskListEntry> list2)
@@ -1141,7 +1141,7 @@ namespace MonoDevelop.Gettext
 				Runtime.RunInMainThread (() => {
 					ClearTasks ();
 					currentTasks = tasks;
-					TaskService.Errors.AddRange (tasks);
+					IdeServices.TaskService.Errors.AddRange (tasks);
 				});
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
index c1bb0ba47b..1883d23709 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
@@ -1,4 +1,4 @@
-// GettextTool.cs
+// GettextTool.cs
 //
 // Author:
 //   Lluis Sanchez Gual <lluis@novell.com>
@@ -45,8 +45,6 @@ namespace MonoDevelop.Gettext
 		
 		public async Task<int> Run (string[] arguments)
 		{
-			DesktopService.Initialize ();
-
 			Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Gettext Update Tool"));
 			foreach (string s in arguments)
 				ReadArgument (s);
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs
index 4cfaf6d88c..b752819a68 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/TranslationProject.cs
@@ -1,4 +1,4 @@
-//

+//

 // TranslationProject.cs

 //

 // Author:

@@ -255,7 +255,7 @@ namespace MonoDevelop.Gettext
 					if (!File.Exists (file.FilePath))

 						continue;

 					if (file.Subtype == Subtype.Code) {

-						string mimeType = DesktopService.GetMimeTypeForUri (file.FilePath);

+						string mimeType = IdeServices.DesktopService.GetMimeTypeForUri (file.FilePath);

 						foreach (IFileScanner fs in scanners) {

 							if (fs.CanScan (this, catalog, file.FilePath, mimeType))

 								fs.UpdateCatalog (this, catalog, monitor, file.FilePath);

diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
index 4a998d7201..c5ab26c480 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs
@@ -1,4 +1,4 @@
-//
+//
 // CodeBinder.cs
 //
 // Author:
@@ -273,7 +273,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 //			var matches = new List<INamedTypeSymbol> ();
 //			ParsedDocument unit = null;
 //			var ctx = gproject.GetParserContext ();
-//			var doc = TypeSystemService.ParseFile (project, classFile);
+//			var doc = IdeApp.TypeSystemService.ParseFile (project, classFile);
 //			if (doc != null) {
 //				unit = doc;
 //				foreach (var fcls in unit.TopLevelTypeDefinitions) {
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
index a5be678483..3bdfd4a8b1 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
@@ -1,4 +1,4 @@
-//
+//
 // GuiBuilderProject.cs
 //
 // Author:
@@ -340,10 +340,10 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		void OnFileAdded (object sender, ProjectFileEventArgs e)
 		{
 			foreach (ProjectFileEventInfo args in e) {
-				var docId = TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name);
+				var docId = IdeApp.TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name);
 				if (docId == null)
 					continue;
-				var doc = TypeSystemService.GetCodeAnalysisDocument (docId);
+				var doc = IdeApp.TypeSystemService.GetCodeAnalysisDocument (docId);
 				if (doc == null)
 					continue;
 	
@@ -373,10 +373,10 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 
 			foreach (ProjectFileEventInfo args in e) {
 
-				var docId = TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name);
+				var docId = IdeApp.TypeSystemService.GetDocumentId (args.Project, args.ProjectFile.Name);
 				if (docId == null)
 					continue;
-				var doc = TypeSystemService.GetCodeAnalysisDocument (docId);
+				var doc = IdeApp.TypeSystemService.GetCodeAnalysisDocument (docId);
 				if (doc == null)
 					continue;
 				var semanticModel = doc.GetSemanticModelAsync ().Result;
@@ -554,7 +554,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		{
 			System.Threading.Tasks.Task<Compilation> task;
 			do {
-				task = TypeSystemService.GetCompilationAsync (Project);
+				task = IdeApp.TypeSystemService.GetCompilationAsync (Project);
 				task.Wait (500);
 			} while (!task.IsCompleted);
 
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
index 628ae3560a..0b374f4a72 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
@@ -1,4 +1,4 @@
-//
+//
 // GtkDesignInfo.cs
 //
 // Authors:
@@ -216,7 +216,7 @@ namespace MonoDevelop.GtkCore
 				return (bool)project.ExtendedProperties ["GtkRefactoringSupported"];
 
 			var testFileName = project.LanguageBinding.GetFileName ("test");
-			bool hasSupport = CodeGenerator.HasGenerator (DesktopService.GetMimeTypeForUri (testFileName));
+			bool hasSupport = CodeGenerator.HasGenerator (IdeServices.DesktopService.GetMimeTypeForUri (testFileName));
 			project.ExtendedProperties ["GtkRefactoringSupported"] = hasSupport;
 			return hasSupport;
 		}
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs
index 6128a6a9bf..c20b13cd50 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ProjectResourceProvider.cs
@@ -1,4 +1,4 @@
-//
+//
 // ProjectResourceProvider.cs
 //
 // Author:
@@ -48,7 +48,7 @@ namespace MonoDevelop.GtkCore
 			ArrayList list = new ArrayList ();
 			foreach (ProjectFile file in project.Files) {
 				if (file.BuildAction == BuildAction.EmbeddedResource)
-					list.Add (new Stetic.ResourceInfo (file.ResourceId, file.Name, DesktopService.GetMimeTypeForUri (file.Name)));
+					list.Add (new Stetic.ResourceInfo (file.ResourceId, file.Name, IdeServices.DesktopService.GetMimeTypeForUri (file.Name)));
 			}
 			return (Stetic.ResourceInfo[]) list.ToArray (typeof(Stetic.ResourceInfo));
 		}
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs
index 7b04a0876f..852aa83080 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/LicenseAcceptanceDialog.cs
@@ -1,4 +1,4 @@
-// 

+// 

 // LicenseAcceptanceDialog.cs

 // 

 // Author:

@@ -134,7 +134,7 @@ namespace MonoDevelop.PackageManagement
 			});

 			var licenseLabel = new LinkLabel (GettextCatalog.GetString ("View License"));

 			licenseLabel.Uri = package.LicenseUrl;

-			licenseLabel.LinkClicked += (sender, e) => DesktopService.ShowUrl (e.Target.AbsoluteUri);

+			licenseLabel.LinkClicked += (sender, e) => IdeServices.DesktopService.ShowUrl (e.Target.AbsoluteUri);

 			titleBox.PackStart (licenseLabel);

 

 			var rowBox = new HBox ();

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopSolutionManager.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopSolutionManager.cs
index 48e067851e..fee7c4fe3c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopSolutionManager.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/MonoDevelopSolutionManager.cs
@@ -172,7 +172,7 @@ namespace MonoDevelop.PackageManagement
 
 		void UpdateConfiguration ()
 		{
-			Configuration = IdeApp.Workspace?.ActiveConfiguration ?? ConfigurationSelector.Default;
+			Configuration = IdeApp.IsInitialized ? IdeApp.Workspace?.ActiveConfiguration ?? ConfigurationSelector.Default : ConfigurationSelector.Default;
 		}
 
 		public void EnsureSolutionIsLoaded ()
diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Gui/GtkReferenceAssembliesOptionsPanelWidget.UI.cs b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Gui/GtkReferenceAssembliesOptionsPanelWidget.UI.cs
index 709e960c98..754586f6ef 100644
--- a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Gui/GtkReferenceAssembliesOptionsPanelWidget.UI.cs
+++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Gui/GtkReferenceAssembliesOptionsPanelWidget.UI.cs
@@ -59,7 +59,7 @@ namespace MonoDevelop.Packaging.Gui
 			learnMoreLabel.Xalign = 0F;
 			learnMoreLabel.LabelProp = GettextCatalog.GetString ("<a href=\"https://docs.nuget.org\">Learn more</a>");
 			learnMoreLabel.UseMarkup = true;
-			learnMoreLabel.SetLinkHandler (DesktopService.ShowUrl);
+			learnMoreLabel.SetLinkHandler (IdeServices.DesktopService.ShowUrl);
 			referenceAssembliesLabelHBox.PackStart (learnMoreLabel, false, false, 0);
 
 			vbox.PackStart (referenceAssembliesLabelHBox, false, false, 5);
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
index 8603f62884..2e3cf9ac71 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
@@ -55,7 +55,7 @@ namespace MonoDevelop.AnalysisCore
 				return;
 
 			Dictionary<CodeDiagnosticDescriptor, DiagnosticSeverity?> severities = new Dictionary<CodeDiagnosticDescriptor, DiagnosticSeverity?> ();
-			var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ();
+			var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.Instance.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ();
 			var language = CodeRefactoringService.MimeTypeToLanguage (lang);
 			foreach (var node in options.AllDiagnostics.Where (x => x.Languages.Contains (language))) {
 				severities [node] = node.DiagnosticSeverity;
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs
index c138428331..e72923f9c3 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultTooltipProvider.cs
@@ -1,4 +1,4 @@
-
+
 // 
 // ResultTooltipProvider.cs
 //  
@@ -45,6 +45,7 @@ using Microsoft.CodeAnalysis.CodeFixes;
 using System.Reflection;
 using MonoDevelop.CodeActions;
 using System.Windows.Input;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.AnalysisCore.Gui
 {
@@ -73,7 +74,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 				return null;
 			var sb = StringBuilderCache.Allocate ();
 			sb.Append ("<span font='");
-			sb.Append (FontService.SansFontName);
+			sb.Append (IdeServices.FontService.SansFontName);
 			sb.Append ("' size='small'>");
 			int minOffset = int.MaxValue;
 			int maxOffset = -1;
@@ -122,10 +123,10 @@ namespace MonoDevelop.AnalysisCore.Gui
 				if (root.Span.End < offset) {
 					LoggingService.LogError ($"Error in ResultTooltipProvider.GetItem offset {offset} not inside syntax root {root.Span.End} document length {editor.Length}.");
 				} else {
-					var codeFixService = Ide.Composition.CompositionManager.GetExportedValue<ICodeFixService> ();
+					var codeFixService = Ide.Composition.CompositionManager.Instance.GetExportedValue<ICodeFixService> ();
 					var span = new TextSpan (offset, 0);
 					var fixes = await codeFixService.GetFixesAsync (ad, span, true, token);
-					var codeRefactoringService = Ide.Composition.CompositionManager.GetExportedValue<Microsoft.CodeAnalysis.CodeRefactorings.ICodeRefactoringService> ();
+					var codeRefactoringService = Ide.Composition.CompositionManager.Instance.GetExportedValue<Microsoft.CodeAnalysis.CodeRefactorings.ICodeRefactoringService> ();
 					var refactorings = await codeRefactoringService.GetRefactoringsAsync (ad, span, token);
 					tag = new CodeActions.CodeActionContainer (fixes, refactorings) {
 						Span = new TextSpan (minOffset, Math.Max (0,  maxOffset - minOffset)),
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
index 028bc37fcd..1a8be1f307 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
@@ -69,7 +69,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 	public class ResultsEditorExtension : TextEditorExtension, IQuickTaskProvider
 	{
 		bool disposed;
-		IDiagnosticService diagService = Ide.Composition.CompositionManager.GetExportedValue<IDiagnosticService> ();
+		IDiagnosticService diagService = Ide.Composition.CompositionManager.Instance.GetExportedValue<IDiagnosticService> ();
 		
 		protected override void Initialize ()
 		{
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
index 0e97bc01e7..6fb4d6c177 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
@@ -122,8 +122,8 @@ namespace MonoDevelop.CodeActions
 			}
 		}
 
-		ICodeFixService codeFixService = Ide.Composition.CompositionManager.GetExportedValue<ICodeFixService> ();
-		ICodeRefactoringService codeRefactoringService = Ide.Composition.CompositionManager.GetExportedValue<ICodeRefactoringService> ();
+		ICodeFixService codeFixService = Ide.Composition.CompositionManager.Instance.GetExportedValue<ICodeFixService> ();
+		ICodeRefactoringService codeRefactoringService = Ide.Composition.CompositionManager.Instance.GetExportedValue<ICodeRefactoringService> ();
 		internal Task<CodeActionContainer> GetCurrentFixesAsync (CancellationToken cancellationToken)
 		{
 			var loc = Editor.CaretOffset;
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs
index 3cd7acd1b2..571ad8e205 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionPanelWidget.cs
@@ -65,7 +65,7 @@ namespace MonoDevelop.CodeActions
 		void GetAllProviderStates ()
 		{
 			var language = CodeRefactoringService.MimeTypeToLanguage (mimeType);
-			var options = ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ().Result;
+			var options = ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.Instance.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ().Result;
 			foreach (var node in options.AllRefactorings.Where (x => x.Language.Contains (language))) {
 				providerStates [node] = node.IsEnabled;
 			}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs
index 463f0d680d..f309fa2a76 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeFixMenuService.cs
@@ -63,7 +63,7 @@ namespace MonoDevelop.CodeActions
 				return menu;

 			}
 
-			var options = ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ().Result;
+			var options = ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.Instance.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ().Result;
 			int mnemonic = 1;
 
 			var suppressLabel = GettextCatalog.GetString ("_Suppress");
@@ -284,8 +284,8 @@ namespace MonoDevelop.CodeActions
 					var insertion = await insertionAction.CreateInsertion (token).ConfigureAwait (false);
 
 					var document = await IdeApp.Workbench.OpenDocument (insertion.Location.SourceTree.FilePath, documentContext.Project);
-					var parsedDocument = await document.UpdateParseDocument ();
-					var model = await document.AnalysisDocument.GetSemanticModelAsync (token);
+					var parsedDocument = await document.DocumentContext.UpdateParseDocument ();
+					var model = await document.DocumentContext.AnalysisDocument.GetSemanticModelAsync (token);
 					if (parsedDocument != null) {
 						var insertionPoints = InsertionPointService.GetInsertionPoints (
 							document.Editor,
@@ -300,8 +300,8 @@ namespace MonoDevelop.CodeActions
 							point => {
 								if (!point.Success)
 									return;
-								var node = Formatter.Format (insertion.Node, document.RoslynWorkspace, document.GetOptionSet (), token);
-								point.InsertionPoint.Insert (document.Editor, document, node.ToString ());
+								var node = Formatter.Format (insertion.Node, document.DocumentContext.RoslynWorkspace, document.DocumentContext.GetOptionSet (), token);
+								point.InsertionPoint.Insert (document.Editor, document.DocumentContext, node.ToString ());
 								// document = await Simplifier.ReduceAsync(document.AnalysisDocument, Simplifier.Annotation, cancellationToken: token).ConfigureAwait(false);
 							}
 						);
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs
index 3f1424f14f..0eab63ff83 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeDiagnosticRunner.cs
@@ -77,7 +77,7 @@ namespace MonoDevelop.CodeIssues
 					if (skip)
 						continue;
 
-					var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ();
+					var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.Instance.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ();
 					if (options.TryGetDiagnosticDescriptor (data.Id, out var desc) && !data.IsEnabledByDefault)
 						continue;
 
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeRulePanel.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeRulePanel.cs
index af0fd562ad..ae23d4bfec 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeRulePanel.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeRulePanel.cs
@@ -1,4 +1,4 @@
-//
+//
 // CodeRulePanel.cs
 //
 // Author:
@@ -65,9 +65,9 @@ namespace MonoDevelop.CodeIssues
 				TextEditor.MimeType = "application/xml";
 				TextEditor.Options = DefaultSourceEditorOptions.PlainEditor;
 				try {
-					TextEditor.Text = TextFileUtility.GetText (TypeSystemService.RuleSetManager.GlobalRulesetFileName, out encoding);
+					TextEditor.Text = TextFileUtility.GetText (IdeApp.TypeSystemService.RuleSetManager.GlobalRulesetFileName, out encoding);
 				} catch (Exception e) {
-					LoggingService.LogError ("Error while loading global rule set file " + TypeSystemService.RuleSetManager, e);
+					LoggingService.LogError ("Error while loading global rule set file " + IdeApp.TypeSystemService.RuleSetManager, e);
 					loadingError = true;
 				}
 			}
@@ -77,10 +77,10 @@ namespace MonoDevelop.CodeIssues
 				if (loadingError)
 					return;
 				try {
-					TextFileUtility.WriteText (TypeSystemService.RuleSetManager.GlobalRulesetFileName, TextEditor.Text, encoding);
+					TextFileUtility.WriteText (IdeApp.TypeSystemService.RuleSetManager.GlobalRulesetFileName, TextEditor.Text, encoding);
 				} catch (Exception e) {
-					LoggingService.LogError ("Error while saving global rule set file " + TypeSystemService.RuleSetManager.GlobalRulesetFileName, e);
-					MessageService.ShowError (GettextCatalog.GetString ("Error while saving global rule set file '{0}'.", TypeSystemService.RuleSetManager.GlobalRulesetFileName));
+					LoggingService.LogError ("Error while saving global rule set file " + IdeApp.TypeSystemService.RuleSetManager.GlobalRulesetFileName, e);
+					MessageService.ShowError (GettextCatalog.GetString ("Error while saving global rule set file '{0}'.", IdeApp.TypeSystemService.RuleSetManager.GlobalRulesetFileName));
 				}
 			}
 		}
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs
index c4c6491f05..f5851befbd 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/BatchFixer.cs
@@ -1,4 +1,4 @@
-//
+//
 // BatchFixer.cs
 //
 // Author:
@@ -102,13 +102,13 @@ namespace MonoDevelop.CodeIssues
 		{
 			var issues = new List<CodeIssue> ();
 //			
-//			var document = TypeSystemService.ParseFile (file.Project, data);
+//			var document = IdeApp.TypeSystemService.ParseFile (file.Project, data);
 //			if (document == null) {
 				refactoringContext = null;
 //				return issues;
 //			}
 //
-//			var content = TypeSystemService.GetProjectContext (file.Project);
+//			var content = IdeApp.TypeSystemService.GetProjectContext (file.Project);
 //			var compilation  = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation ();
 //			var resolver = new CSharpAstResolver (compilation, document.GetAst<SyntaxTree> (), document.ParsedFile as ICSharpCode.NRefactory.CSharp.TypeSystem.CSharpUnresolvedFile);
 //			
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs
index 8306a6ab3c..501d59c101 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/CodeAnalysisBatchRunner.cs
@@ -1,4 +1,4 @@
-//
+//
 // CodeIssueBatchRunner.cs
 //
 // Author:
@@ -115,11 +115,11 @@ namespace MonoDevelop.CodeIssues
 //				// Swallow exception and ignore this file
 //				return;
 //			}
-//			var document = TypeSystemService.ParseFile (file.Project, editor);
+//			var document = IdeApp.TypeSystemService.ParseFile (file.Project, editor);
 //			if (document == null)
 //				return;
 //
-//			var content = TypeSystemService.GetProjectContext (file.Project);
+//			var content = IdeApp.TypeSystemService.GetProjectContext (file.Project);
 //			var compilation = content.AddOrUpdateFiles (document.ParsedFile).CreateCompilation ();
 //
 //			CSharpAstResolver resolver;
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs
index 15878be01b..156933f3f1 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/Pad/Runner/SimpleAnalysisJob.cs
@@ -1,4 +1,4 @@
-//
+//
 // AbstractAnalysisJob.cs
 //
 // Author:
@@ -81,7 +81,7 @@ namespace MonoDevelop.CodeIssues
 
 		public IEnumerable<BaseCodeIssueProvider> GetIssueProviders (ProjectFile file)
 		{
-			return RefactoringService.GetInspectors (DesktopService.GetMimeTypeForUri (file.Name))
+			return RefactoringService.GetInspectors (IdeServices.DesktopService.GetMimeTypeForUri (file.Name))
 				.Where (provider => {
 					var severity = provider.GetSeverity ();
 					if (severity == Severity.None || !provider.GetIsEnabled ())
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/AbstractOptionPreviewViewModel.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/AbstractOptionPreviewViewModel.cs
index 1b9af87145..43817ec03d 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/AbstractOptionPreviewViewModel.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/AbstractOptionPreviewViewModel.cs
@@ -30,30 +30,20 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeStyle;
-using Microsoft.CodeAnalysis.Editor;
-using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Preview;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Text.Projection;
-using Microsoft.VisualStudio.Utilities;
-using Roslyn.Utilities;
-using MonoDevelop.Ide.Editor;
-using MonoDevelop.Ide.Composition;
 using MonoDevelop.Core.Text;
+using MonoDevelop.Ide.Editor;
 using MonoDevelop.Ide.TypeSystem;
-using MonoDevelop.Projects;
-using System.Threading.Tasks;
-using MonoDevelop.Core;
+using Roslyn.Utilities;
 
 namespace MonoDevelop.Refactoring.Options
 {
@@ -129,7 +119,7 @@ namespace MonoDevelop.Refactoring.Options
 
 		public async void UpdatePreview (string text)
 		{
-			var workspace = new PreviewWorkspace (MonoDevelop.Ide.Composition.CompositionManager.Instance.HostServices);
+			var workspace = new PreviewWorkspace (Ide.Composition.CompositionManager.Instance.HostServices);
 			var fileName = string.Format ("project.{0}", Language == "C#" ? "csproj" : "vbproj");
 			project = workspace.CurrentSolution.AddProject (fileName, "assembly.dll", Language);
 
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/UI/GridOptionPreviewControl.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/UI/GridOptionPreviewControl.cs
index 85e5f6e03a..b1c29c76d5 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/UI/GridOptionPreviewControl.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Options/UI/GridOptionPreviewControl.cs
@@ -35,6 +35,7 @@ using System.Composition.Hosting;
 using MonoDevelop.Ide.Composition;
 using MonoDevelop.Core;
 using System.Collections.Generic;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.Refactoring.Options
 {
@@ -44,7 +45,7 @@ namespace MonoDevelop.Refactoring.Options
 
 		public AbstractOptionPageControl (IServiceProvider serviceProvider)
 		{
-			this.OptionService = TypeSystemService.Workspace.Services.GetService<IOptionService> ();
+			this.OptionService = IdeApp.TypeSystemService.Workspace.Services.GetService<IOptionService> ();
 		}
 	}
 
@@ -65,7 +66,7 @@ namespace MonoDevelop.Refactoring.Options
 
 		public GridOptionPreviewControl (IServiceProvider serviceProvider, Func<OptionSet, IServiceProvider, AbstractOptionPreviewViewModel> createViewModel) : base (serviceProvider)
 		{
-			viewModel = createViewModel (TypeSystemService.Workspace.Options, serviceProvider);
+			viewModel = createViewModel (IdeApp.TypeSystemService.Workspace.Options, serviceProvider);
 			CreateView ();
 			var firstItem = this.viewModel.CodeStyleItems.OfType<AbstractCodeStyleOptionViewModel> ().First ();
 			this.viewModel.SetOptionAndUpdatePreview ((firstItem.SelectedPreference ?? firstItem.Preferences[0]).IsChecked, firstItem.Option, firstItem.GetPreview ());
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.PackageInstaller/PackageInstallerService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.PackageInstaller/PackageInstallerService.cs
index 36aa9a7a60..ea499f5c42 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.PackageInstaller/PackageInstallerService.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.PackageInstaller/PackageInstallerService.cs
@@ -114,7 +114,7 @@ namespace MonoDevelop.Refactoring.PackageInstaller
 
 			public IEnumerable<Project> GetProjectsWithInstalledPackage (Solution solution, string packageName, string version)
 			{
-				return PackageServices.GetProjectsWithInstalledPackage (IdeApp.ProjectOperations.CurrentSelectedSolution, packageName, version).Select (p => TypeSystemService.GetCodeAnalysisProject (p));
+				return PackageServices.GetProjectsWithInstalledPackage (IdeApp.ProjectOperations.CurrentSelectedSolution, packageName, version).Select (p => IdeApp.TypeSystemService.GetCodeAnalysisProject (p));
 			}
 
 			public bool IsInstalled (Workspace workspace, ProjectId projectId, string packageName)
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeCurrentProjectHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeCurrentProjectHandler.cs
index 04d590cb79..06d58b6073 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeCurrentProjectHandler.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeCurrentProjectHandler.cs
@@ -52,7 +52,7 @@ namespace MonoDevelop.Refactoring
 		protected override void Update (CommandInfo info)
 		{
 			var project = IdeApp.ProjectOperations.CurrentSelectedProject;
-			if (project == null || TypeSystemService.GetCodeAnalysisProject (project) == null) {
+			if (project == null || IdeApp.TypeSystemService.GetCodeAnalysisProject (project) == null) {
 				info.Text = GettextCatalog.GetString ("Current Project");
 				info.Enabled = false;
 				return;
@@ -71,7 +71,7 @@ namespace MonoDevelop.Refactoring
 			var project = IdeApp.ProjectOperations.CurrentSelectedProject;
 			if (project == null)
 				return;
-			var analysisProject = TypeSystemService.GetCodeAnalysisProject (project);
+			var analysisProject = IdeApp.TypeSystemService.GetCodeAnalysisProject (project);
 			if (analysisProject == null)
 				return;
 			try {
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs
index 5a09a86840..797c3da6bd 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/AnalyzeWholeSolutionHandler.cs
@@ -52,7 +52,7 @@ namespace MonoDevelop.Refactoring
 		{

 			var providers = new List<DiagnosticAnalyzer> ();
 			var alreadyAdded = new HashSet<Type> ();
-			var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ();
+			var options = await ((MonoDevelopWorkspaceDiagnosticAnalyzerProviderService)Ide.Composition.CompositionManager.Instance.GetExportedValue<IWorkspaceDiagnosticAnalyzerProviderService> ()).GetOptionsAsync ();
 			var diagnostics = options.AllDiagnostics.Where (x => x.Languages.Contains (LanguageNames.CSharp));
 			var diagnosticTable = new Dictionary<string, CodeDiagnosticDescriptor> ();
 			foreach (var diagnostic in diagnostics) {
@@ -115,7 +115,7 @@ namespace MonoDevelop.Refactoring
 
 		internal static async void Execute ()
 		{

-			var workspace = TypeSystemService.Workspace;
+			var workspace = IdeApp.TypeSystemService.Workspace;
 			try {
 				using (var monitor = IdeApp.Workbench.ProgressMonitors.GetStatusProgressMonitor (GettextCatalog.GetString ("Analyzing solution"), null, false, true, false, null, true)) {
 					CancellationToken token = monitor.CancellationToken;
@@ -147,8 +147,8 @@ namespace MonoDevelop.Refactoring
 		internal static void Report (ProgressMonitor monitor, List<Diagnostic> allDiagnostics, Projects.WorkspaceObject parent)
 		{
 			monitor.BeginTask (GettextCatalog.GetString ("Reporting results..."), allDiagnostics.Count);
-			TaskService.Errors.Clear ();
-			TaskService.Errors.AddRange (allDiagnostics.Select (diagnostic => {
+			IdeServices.TaskService.Errors.Clear ();
+			IdeServices.TaskService.Errors.AddRange (allDiagnostics.Select (diagnostic => {
 				var startLinePosition = diagnostic.Location.GetLineSpan ().StartLinePosition;
 				return new TaskListEntry (
 					diagnostic.Location.SourceTree.FilePath,
@@ -172,7 +172,7 @@ namespace MonoDevelop.Refactoring
 
 		static void ShowAnalyzationResults ()
 		{

-			TaskService.ShowErrors ();
+			IdeServices.TaskService.ShowErrors ();
 			var errorsPad = IdeApp.Workbench.GetPad<ErrorListPad> ().Content as ErrorListPad;
 			errorsPad.SetFilter (true, true, true);
 		}
@@ -207,7 +207,7 @@ namespace MonoDevelop.Refactoring
 
 			public override Projects.Project Project {
 				get {
-					return TypeSystemService.GetMonoProject (project);
+					return IdeApp.TypeSystemService.GetMonoProject (project);
 				}
 			}
 
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
index ae8a9e92bb..d8dad6141f 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // RefactoringOptions.cs
 //  
 // Author:
@@ -66,7 +66,7 @@ namespace MonoDevelop.Refactoring
 		
 		public string MimeType {
 			get {
-				return DesktopService.GetMimeTypeForUri (DocumentContext.Name);
+				return IdeServices.DesktopService.GetMimeTypeForUri (DocumentContext.Name);
 			}
 		}
 		
@@ -81,7 +81,7 @@ namespace MonoDevelop.Refactoring
 		{
 		}
 
-		public RefactoringOptions (MonoDevelop.Ide.Gui.Document doc) : this(doc.Editor, doc)
+		public RefactoringOptions (MonoDevelop.Ide.Gui.Document doc) : this(doc.Editor, doc.DocumentContext)
 		{
 		}
 
@@ -172,7 +172,7 @@ namespace MonoDevelop.Refactoring
 //		public List<string> GetResolveableNamespaces (RefactoringOptions options, out bool resolveDirect)
 //		{
 //			IReturnType returnType = null; 
-//			INRefactoryASTProvider astProvider = RefactoringService.GetASTProvider (DesktopService.GetMimeTypeForUri (options.Document.FileName));
+//			INRefactoryASTProvider astProvider = RefactoringService.GetASTProvider (IdeServices.DesktopService.GetMimeTypeForUri (options.Document.FileName));
 //			
 //			if (options.ResolveResult != null && options.ResolveResult.ResolvedExpression != null) {
 //				if (astProvider != null) 
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
index bfb8a69ea8..386fd9c1f8 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // RefactoringPreviewDialog.cs
 //  
 // Author:
@@ -168,7 +168,7 @@ namespace MonoDevelop.Refactoring
 			
 			TreeIter result;
 			if (!fileDictionary.TryGetValue (replaceChange.FileName, out result))
-				fileDictionary[replaceChange.FileName] = result = store.AppendValues (DesktopService.GetIconForFile (replaceChange.FileName, IconSize.Menu), System.IO.Path.GetFileName (replaceChange.FileName), null, true);
+				fileDictionary[replaceChange.FileName] = result = store.AppendValues (IdeServices.DesktopService.GetIconForFile (replaceChange.FileName, IconSize.Menu), System.IO.Path.GetFileName (replaceChange.FileName), null, true);
 			return result;
 		}
 
@@ -260,7 +260,7 @@ namespace MonoDevelop.Refactoring
 				layout = new Pango.Layout (container.PangoContext);
 				layout.SingleParagraphMode = false;
 				if (diffMode) {
-					layout.FontDescription = FontService.MonospaceFont;
+					layout.FontDescription = IdeServices.FontService.MonospaceFont;
 					layout.SetText (text);
 				} else {
 					layout.SetMarkup (text);
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextEditorKeyPressTimings.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextEditorKeyPressTimings.cs
index fddc0a37c6..6a7f9f7884 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextEditorKeyPressTimings.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextEditorKeyPressTimings.cs
@@ -76,7 +76,7 @@ namespace Mono.TextEditor
 
 		public TextEditorKeyPressTimings (TextDocument document)
 		{
-			telemetry = DesktopService.PlatformTelemetry;
+			telemetry = IdeServices.DesktopService?.PlatformTelemetry;
 
 			openTime = GetCurrentTime ();
 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
index ca12d8fa90..1ce5a0c5ac 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 
 			style = style.CloneWithName (entryName.Text);
 
-			string path = MonoDevelop.Ide.Editor.TextEditorDisplayBinding.SyntaxModePath;
+			string path = SyntaxHighlightingService.SyntaxModePath;
 			string baseName = style.Name.Replace (" ", "_");
 
 			while (File.Exists (System.IO.Path.Combine (path, baseName + ".tmTheme"))) {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ClipboardRingService.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ClipboardRingService.cs
index 8b7b82c1c5..e5cbe4f179 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ClipboardRingService.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ClipboardRingService.cs
@@ -106,7 +106,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			static readonly ToolboxItemFilterAttribute filterAtt = new ToolboxItemFilterAttribute ("text/plain", ToolboxItemFilterType.Allow);
 			static readonly string category = GettextCatalog.GetString ("Clipboard Ring");
-			static readonly Xwt.Drawing.Image icon = DesktopService.GetIconForFile ("a.txt", IconSize.Menu);
+			static readonly Xwt.Drawing.Image icon = IdeServices.DesktopService.GetIconForFile ("a.txt", IconSize.Menu);
 
 			public ClipboardToolboxNode (string text)
 			{
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
index 3a992d8567..ab8eced2a9 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
@@ -1,4 +1,4 @@
-// DebugValueWindow.cs
+// DebugValueWindow.cs
 //
 // Author:
 //   Lluis Sanchez Gual <lluis@novell.com>
@@ -195,7 +195,7 @@ namespace MonoDevelop.SourceEditor
 				this.GetPosition (out x, out y);
 				oldY = y;
 
-				Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (x, y));
+				Xwt.Rectangle geometry = IdeServices.DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (x, y));
 				int top = (int)geometry.Top;
 				if (allocation.Height <= geometry.Height && y + allocation.Height >= geometry.Y + geometry.Height - edgeGap)
 					y = top + ((int)geometry.Height - allocation.Height - edgeGap);
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs
index fd324c9191..f03a911949 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/LanguageItemWindow.cs
@@ -1,4 +1,4 @@
-// LanguageItemWindow.cs
+// LanguageItemWindow.cs
 //
 // Author:
 //   Mike Krüger <mkrueger@novell.com>
@@ -34,6 +34,7 @@ using MonoDevelop.Ide.Gui;
 using MonoDevelop.Core;
 using MonoDevelop.Ide.Fonts;
 using MonoDevelop.Ide.TypeSystem;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.SourceEditor
 {
@@ -84,7 +85,7 @@ namespace MonoDevelop.SourceEditor
 		{
 			if (label == null)
 				return;
-			label.FontDescription = FontService.GetFontDescription ("Pad");
+			label.FontDescription = IdeServices.FontService.GetFontDescription ("Pad");
 			
 		}
 	}
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
index 38959fc431..e05c1ff759 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // MessageBubbleCache.cs
 //  
 // Author:
@@ -60,9 +60,9 @@ namespace MonoDevelop.SourceEditor
 			editor.TextArea.BeginHover += HandleBeginHover;
 			editor.VAdjustment.ValueChanged += HandleValueChanged;
 			editor.HAdjustment.ValueChanged += HandleValueChanged;
-			fontDescription = FontService.GetFontDescription ("Pad");
-			tooltipFontDescription = FontService.GetFontDescription ("Pad").CopyModified (weight: Pango.Weight.Bold);
-			errorCountFontDescription = FontService.GetFontDescription ("Pad").CopyModified (weight: Pango.Weight.Bold);
+			fontDescription = IdeServices.FontService.GetFontDescription ("Pad");
+			tooltipFontDescription = IdeServices.FontService.GetFontDescription ("Pad").CopyModified (weight: Pango.Weight.Bold);
+			errorCountFontDescription = IdeServices.FontService.GetFontDescription ("Pad").CopyModified (weight: Pango.Weight.Bold);
 		}
 
 		void HandleValueChanged (object sender, EventArgs e)
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/Language/Impl/Intellisense/SignatureHelp/DefaultSignatureHelpPresenterSurfaceElement.cs b/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/Language/Impl/Intellisense/SignatureHelp/DefaultSignatureHelpPresenterSurfaceElement.cs
index 78018663ce..31dd15adcf 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/Language/Impl/Intellisense/SignatureHelp/DefaultSignatureHelpPresenterSurfaceElement.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/Language/Impl/Intellisense/SignatureHelp/DefaultSignatureHelpPresenterSurfaceElement.cs
@@ -1,4 +1,4 @@
-using System;

+using System;

 using System.Collections.Generic;

 using System.Linq;

 using System.Text;

@@ -86,14 +86,14 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
             if (!scheme.FitsIdeTheme(IdeApp.Preferences.UserInterfaceTheme))

                 scheme = SyntaxHighlightingService.GetDefaultColorStyle(IdeApp.Preferences.UserInterfaceTheme);

             Theme.SetSchemeColors(scheme);

-            Theme.Font = FontService.SansFont.CopyModified(Styles.FontScale11).ToXwtFont();

+            Theme.Font = IdeServices.FontService.SansFont.CopyModified(Styles.FontScale11).ToXwtFont();

             Theme.ShadowColor = Styles.PopoverWindow.ShadowColor;

             foreColor = Styles.PopoverWindow.DefaultTextColor.ToCairoColor();

 

             if (DataContext != null)

             {

                 DataContext.SignatureWpfViewVisualElement.ModifyFg(StateType.Normal, foreColor.ToGdkColor());

-                DataContext.SignatureWpfViewVisualElement.FontDescription = FontService.GetFontDescription("Editor").CopyModified(Styles.FontScale11);

+                DataContext.SignatureWpfViewVisualElement.FontDescription = IdeServices.FontService.GetFontDescription("Editor").CopyModified(Styles.FontScale11);

             }

             //if (this.Visible)

             //	QueueDraw ();

diff --git a/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/MDUtils.cs b/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/MDUtils.cs
index 1db38d9500..5a70528b2d 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/MDUtils.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/MDUtils.cs
@@ -1,4 +1,4 @@
-using System;

+using System;

 using System.Collections.Generic;

 using System.Linq;

 using System.Text;

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.VisualStudio.Text;

 using Microsoft.VisualStudio.Text.Classification;

 using MonoDevelop.Core;

+using MonoDevelop.Ide;

 using MonoDevelop.Ide.Editor;

 using MonoDevelop.Ide.Editor.Highlighting;

 using MonoDevelop.Ide.Fonts;
@@ -28,7 +29,7 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
 				if (!inDocumentation) {

 					if (part.ClassificationType.Classification == ClassificationTypeNames.Text) {
 						inDocumentation = true;

-						markup.Append ("<span font='" + FontService.SansFontName + "' size='small'>");

+						markup.Append ("<span font='" + IdeServices.FontService.SansFontName + "' size='small'>");

 						markup.AppendLine ();

 					}
 					else {
@@ -83,7 +84,7 @@ namespace Microsoft.VisualStudio.Language.Intellisense.Implementation
 
 			if (currentParameter != null) {

 				if (!string.IsNullOrEmpty(currentParameter.Documentation)) {

-					markup.Append ("<span font='" + FontService.SansFontName + "'");

+					markup.Append ("<span font='" + IdeServices.FontService.SansFontName + "'");

 					//markup.Append ("foreground ='" + GetThemeColor (theme, "source.cs") + "'");

 					markup.Append (" size='small'>");

 					markup.AppendLine ();

diff --git a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs
index a59bbcbf71..48b4efc32f 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Gui/TestResultsPad.cs
@@ -141,7 +141,7 @@ namespace MonoDevelop.UnitTesting
 			book.Pack1 (sw, true, true);
 
 			outputView = new MonoDevelop.Ide.Gui.Components.LogView.LogTextView { Name = "testResultOutput" };
-			outputView.ModifyFont (FontService.MonospaceFont);
+			outputView.ModifyFont (IdeServices.FontService.MonospaceFont);
 			outputView.Editable = false;
 			bold = new TextTag ("bold");
 			bold.Weight = Pango.Weight.Bold;
@@ -745,7 +745,7 @@ namespace MonoDevelop.UnitTesting
 					const int maxLineLength = 255;
 					const int maxLineNumber = 255;
 					sb.Append ("<span font='");
-					sb.Append (FontService.MonospaceFontName);
+					sb.Append (IdeServices.FontService.MonospaceFontName);
 					sb.Append ("'>");
 					using (var sr = new StringReader (result.Message)) {
 						while (null != (curLineText = sr.ReadLine ())) {
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs
index 24a5e9dcc9..fe4b4fc3eb 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs
@@ -33,6 +33,7 @@ using MonoDevelop.UnitTesting;
 using MonoDevelop.Ide.TypeSystem;
 using Microsoft.CodeAnalysis;
 using System.Linq;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.UnitTesting.VsTest
 {
@@ -64,7 +65,7 @@ namespace MonoDevelop.UnitTesting.VsTest
 			if (!string.IsNullOrEmpty (test.CodeFilePath))
 				sourceCodeLocation = new SourceCodeLocation (test.CodeFilePath, test.LineNumber, 0);
 			else {
-				TypeSystemService.GetCompilationAsync (Project).ContinueWith ((t) => {
+				IdeApp.TypeSystemService.GetCompilationAsync (Project).ContinueWith ((t) => {
 					var dotIndex = test.FullyQualifiedName.LastIndexOf (".", StringComparison.Ordinal);
 					var className = test.FullyQualifiedName.Remove (dotIndex);
 					var methodName = test.FullyQualifiedName.Substring (dotIndex + 1);
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs
index 9f89cee925..04c3715e09 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/UnitTestService.cs
@@ -1,4 +1,4 @@
-//
+//
 // NUnitService.cs
 //
 // Author:
@@ -423,9 +423,9 @@ namespace MonoDevelop.UnitTesting
 
 		public static string GetTestResultsDirectory (string baseDirectory)
 		{
-			var newCache = TypeSystemService.GetCacheDirectory (baseDirectory, false);
+			var newCache = IdeApp.TypeSystemService.GetCacheDirectory (baseDirectory, false);
 			if (newCache == null) {
-				newCache = TypeSystemService.GetCacheDirectory (baseDirectory, true);
+				newCache = IdeApp.TypeSystemService.GetCacheDirectory (baseDirectory, true);
 				var oldDirectory = Path.Combine (baseDirectory, "test-results");
 				var newDirectory = Path.Combine (newCache, "test-results");
 				try {
diff --git a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs
index 78a26818aa..03f2252b04 100644
--- a/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs
+++ b/main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingService.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // TextTemplatingService.cs
 //  
 // Author:
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using Mono.TextTemplating;
+using MonoDevelop.Ide;
 using MonoDevelop.Ide.Tasks;
 using System.CodeDom.Compiler;
 
@@ -37,12 +38,12 @@ namespace MonoDevelop.TextTemplating
 			if (errors.Count == 0)
 				return;
 			
-			TaskService.Errors.Clear ();
+			IdeServices.TaskService.Errors.Clear ();
 			foreach (CompilerError err in errors) {
-					TaskService.Errors.Add (new TaskListEntry (err.FileName, err.ErrorText, err.Column, err.Line,
+					IdeServices.TaskService.Errors.Add (new TaskListEntry (err.FileName, err.ErrorText, err.Column, err.Line,
 					                                  err.IsWarning? TaskSeverity.Warning : TaskSeverity.Error));
 			}
-			TaskService.ShowErrors ();
+			IdeServices.TaskService.ShowErrors ();
 		}
 		
 		static TemplatingAppDomainRecycler recycler;
diff --git a/main/src/addins/VBNetBinding/MonoDevelop.VBNet/VBNetTextEditorExtension.cs b/main/src/addins/VBNetBinding/MonoDevelop.VBNet/VBNetTextEditorExtension.cs
index e57e007b14..88172e0d62 100644
--- a/main/src/addins/VBNetBinding/MonoDevelop.VBNet/VBNetTextEditorExtension.cs
+++ b/main/src/addins/VBNetBinding/MonoDevelop.VBNet/VBNetTextEditorExtension.cs
@@ -35,7 +35,7 @@ namespace MonoDevelop.VBNet
 	{
 		protected override void Initialize ()
 		{
-			Editor.SyntaxHighlighting = CompositionManager.GetExportedValue<ITagBasedSyntaxHighlightingFactory> ().CreateSyntaxHighlighting (Editor.TextView, "source.vb");
+			Editor.SyntaxHighlighting = CompositionManager.Instance.GetExportedValue<ITagBasedSyntaxHighlightingFactory> ().CreateSyntaxHighlighting (Editor.TextView, "source.vb");
 		}
 	}
 }
diff --git a/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs b/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs
index 8ba7c6c62e..2ba3d37928 100644
--- a/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs
+++ b/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs
@@ -1,4 +1,4 @@
-//  VBCompilerParameters.cs
+//  VBCompilerParameters.cs
 //
 //  This file was derived from a file from #Develop, and relicensed
 //  by Markus Palme to MIT/X11
@@ -36,6 +36,7 @@ using MonoDevelop.Core.Serialization;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.VisualBasic;
 using System.Collections.Immutable;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.VBNetBinding
 {

@@ -204,7 +205,7 @@ namespace MonoDevelop.VBNetBinding
 		public override CompilationOptions CreateCompilationOptions ()
 		{
 			var project = (VBProject)ParentProject;
-			var workspace = Ide.TypeSystem.TypeSystemService.GetWorkspace (project.ParentSolution);
+			var workspace = IdeApp.TypeSystemService.GetWorkspace (project.ParentSolution);
 
 			var options = new VisualBasicCompilationOptions (
 				OutputKind.ConsoleApplication,
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs
index ad5a18da85..76b1765619 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs
@@ -1,4 +1,4 @@
-
+
 using System;
 using System.Collections.Generic;
 using Gtk;
@@ -93,7 +93,7 @@ namespace MonoDevelop.VersionControl.Views
 			Pango.Layout layout = new Pango.Layout (container.PangoContext);
 			layout.SingleParagraphMode = false;
 			if (diffMode) {
-				layout.FontDescription = FontService.MonospaceFont;
+				layout.FontDescription = IdeServices.FontService.MonospaceFont;
 				layout.SetText (text);
 			} else {
 				layout.SetMarkup (text);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
index 0df03a9b53..ca0b3b7d06 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 
 using Gtk;
@@ -234,7 +234,7 @@ namespace MonoDevelop.VersionControl.Views
 			if (n.IsDirectory)
 				fileIcon = ImageService.GetIcon (MonoDevelop.Ide.Gui.Stock.ClosedFolder, Gtk.IconSize.Menu);
 			else
-				fileIcon = DesktopService.GetIconForFile (n.LocalPath, Gtk.IconSize.Menu);
+				fileIcon = IdeServices.DesktopService.GetIconForFile (n.LocalPath, Gtk.IconSize.Menu);
 			
 			TreeIter it = filestore.AppendValues (statusicon, lstatus, GLib.Markup.EscapeText (localpath).Split ('\n'), commit, false, n.LocalPath.ToString (), true, hasComment, fileIcon, n.HasLocalChanges, scolor);
 			if (!n.IsDirectory)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs
index 6ccb133214..8b375cbdef 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CommonTextEditorOptions.cs
@@ -1,4 +1,4 @@
-
+
 // 
 // ComparisonWidget.cs
 //  
@@ -84,7 +84,7 @@ namespace MonoDevelop.VersionControl.Views
 
 		public override void Dispose()
 		{
-			FontService.RemoveCallback (UpdateFont);
+			IdeServices.FontService.RemoveCallback (UpdateFont);
 		}
 
 		void UpdateFont ()
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
index 17cfb0693e..b98b5a3148 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // DropDownBox.cs
 //  
 // Author:
@@ -110,7 +110,7 @@ namespace MonoDevelop.VersionControl.Views
 			window.WidthRequest = Allocation.Width;
 			int width, height;
 			window.GetSizeRequest (out width, out height);
-			Xwt.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (dx, dy));
+			Xwt.Rectangle geometry = IdeServices.DesktopService.GetUsableMonitorGeometry (Screen.Number, Screen.GetMonitorAtPoint (dx, dy));
 			
 			if (dy + height > geometry.Bottom)
 				dy = oy + this.Allocation.Y - height;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
index a4eb5f96ea..bf9bc33725 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
@@ -1,4 +1,4 @@
-//
+//
 // MergeWidget.cs
 //
 // Author:
@@ -79,7 +79,7 @@ namespace MonoDevelop.VersionControl.Views
 
 		public void Load (string fileName)
 		{
-			MainEditor.Document.MimeType = DesktopService.GetMimeTypeForUri (fileName);
+			MainEditor.Document.MimeType = IdeServices.DesktopService.GetMimeTypeForUri (fileName);
 			MainEditor.Document.Text = StringTextSource.ReadFrom (fileName).Text;
 
 			this.CreateDiff ();
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
index 12f642acf8..8359d9a992 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
@@ -1,4 +1,4 @@
-
+
 using System;
 using System.IO;
 using System.Text;
@@ -899,7 +899,7 @@ namespace MonoDevelop.VersionControl
 
 		public virtual bool GetFileIsText (FilePath path)
 		{
-			return DesktopService.GetFileIsText (path);
+			return IdeServices.DesktopService.GetFileIsText (path);
 		}
 	}
 	
diff --git a/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs b/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
index 7f91ebc5f9..60b0675b39 100644
--- a/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
+++ b/main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
@@ -1,4 +1,4 @@
-using System;

+using System;

 using System.IO;

 using System.Linq;

 using System.Collections.Generic;

@@ -77,7 +77,7 @@ namespace SubversionAddinWindows
 						AlertButton.Ok);

 

 					if (res == db) {

-						DesktopService.ShowUrl ("https://www.microsoft.com/en-us/download/details.aspx?id=5555");

+						IdeServices.DesktopService.ShowUrl ("https://www.microsoft.com/en-us/download/details.aspx?id=5555");

 					}

 				}

 				return !installError;

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs
index ad6b0d3a7f..9592d047fb 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/Dialogs/OpenFileDialogHandler.cs
@@ -1,4 +1,4 @@
-// 

+// 

 // OpenFileDialogHandler.cs

 //  

 // Authors:

@@ -236,7 +236,7 @@ namespace MonoDevelop.Platform
 			int selected = -1;

 			int i = 0;

 			bool hasBench = false;

-			var projectService = IdeApp.Services.ProjectService;

+			var projectService = IdeServices.ProjectService;

 			if (projectService.IsWorkspaceItemFile (fileName) || projectService.IsSolutionItemFile (fileName)) {

 				hasBench = true;

 				combo.Items.Add (new ViewerComboItem (null, GettextCatalog.GetString ("Solution Workbench")));

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs
index 4c907433e8..2d843b156a 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/JumpList.cs
@@ -1,4 +1,4 @@
-// 

+// 

 // JumpList.cs

 //  

 // Author:

@@ -40,7 +40,7 @@ namespace MonoDevelop.Platform
 			this.updateTimer.Elapsed += this.OnUpdateTimerEllapsed;

 			this.updateTimer.AutoReset = false;

 			

-			this.recentFiles = DesktopService.RecentFiles;

+			this.recentFiles = IdeServices.DesktopService.RecentFiles;

 			this.recentFiles.Changed += this.OnRecentFilesChanged;

 

 			try {

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs
index 5bd471ab7e..f395a42299 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/StatusBar.xaml.cs
@@ -53,7 +53,7 @@ namespace WindowsPlatform.MainToolbar
 			updateHandler = delegate {

 				int ec = 0, wc = 0;

 

-				foreach (MonoDevelop.Ide.Tasks.TaskListEntry t in TaskService.Errors) {

+				foreach (MonoDevelop.Ide.Tasks.TaskListEntry t in IdeServices.TaskService.Errors) {

 					if (t.Severity == TaskSeverity.Error)

 						ec++;

 					else if (t.Severity == TaskSeverity.Warning)

@@ -73,8 +73,8 @@ namespace WindowsPlatform.MainToolbar
 						BuildResultPanelVisibility = Visibility.Collapsed;

 				});

 			};

-			TaskService.Errors.TasksAdded += updateHandler;

-			TaskService.Errors.TasksRemoved += updateHandler;

+			IdeServices.TaskService.Errors.TasksAdded += updateHandler;

+			IdeServices.TaskService.Errors.TasksRemoved += updateHandler;

 			BrandingService.ApplicationNameChanged += ApplicationNameChanged;

 

 			StatusText.ToolTipOpening += (o, e) => {

@@ -119,8 +119,8 @@ namespace WindowsPlatform.MainToolbar
 

 		public void Dispose ()

 		{

-			TaskService.Errors.TasksAdded -= updateHandler;

-			TaskService.Errors.TasksRemoved -= updateHandler;

+			IdeServices.TaskService.Errors.TasksAdded -= updateHandler;

+			IdeServices.TaskService.Errors.TasksRemoved -= updateHandler;

 			BrandingService.ApplicationNameChanged -= ApplicationNameChanged;

 		}

 

diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
index bfcc1953c3..8ee0e5c2a6 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
@@ -242,7 +242,7 @@ namespace WindowsPlatform.MainToolbar
 

 		void OnMenuLinkClicked (object sender, RoutedEventArgs e)

 		{

-			DesktopService.ShowUrl (menuLinkEntry.Url);

+			IdeServices.DesktopService.ShowUrl (menuLinkEntry.Url);

 		}

 

 		void OnSubmenuClosing ()

diff --git a/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs b/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
index 8d79c1074c..ae36937b89 100644
--- a/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
+++ b/main/src/addins/Xml/Editor/XmlTextEditorExtension.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // XmlTextEditorExtension.cs
 // 
 // Authors:
@@ -95,7 +95,7 @@ namespace MonoDevelop.Xml.Editor
 				XmlSchemaManager.UserSchemaAdded -= UserSchemaAdded;
 
 				XmlSchemaManager.UserSchemaRemoved -= UserSchemaRemoved;
-				TaskService.Errors.ClearByOwner (this);
+				IdeServices.TaskService.Errors.ClearByOwner (this);
 				base.Dispose ();
 			}
 		}
@@ -547,7 +547,7 @@ namespace MonoDevelop.Xml.Editor
 			if (string.IsNullOrEmpty (fileName))
 				return false;
 
-			string mimeType = DesktopService.GetMimeTypeForUri (fileName);
+			string mimeType = IdeServices.DesktopService.GetMimeTypeForUri (fileName);
 			if (IsMimeTypeHandled (mimeType))
 				return true;
 			
@@ -556,7 +556,7 @@ namespace MonoDevelop.Xml.Editor
 		
 		static bool IsMimeTypeHandled (string mimeType)
 		{
-			foreach (var m in DesktopService.GetMimeTypeInheritanceChain (mimeType)) {
+			foreach (var m in IdeServices.DesktopService.GetMimeTypeInheritanceChain (mimeType)) {
 				if (m == TextXmlMimeType || m == ApplicationXmlMimeType)
 					return true;
 			}
@@ -627,7 +627,7 @@ namespace MonoDevelop.Xml.Editor
 		public void CreateSchemaCommand ()
 		{
 			try {
-				TaskService.Errors.Clear ();
+				IdeServices.TaskService.Errors.Clear ();
 
 				string xml = Editor.Text;
 				using (ProgressMonitor monitor = XmlEditorService.GetMonitor ()) {
@@ -703,7 +703,7 @@ namespace MonoDevelop.Xml.Editor
 		[CommandHandler (XmlCommands.Validate)]
 		public async void ValidateCommand ()
 		{
-			TaskService.Errors.Clear ();
+			IdeServices.TaskService.Errors.Clear ();
 			using (var monitor = XmlEditorService.GetMonitor ()) {
 				monitor.BeginTask (GettextCatalog.GetString ("Validating {0}...", FileName.FileName), 0);
 
@@ -724,16 +724,16 @@ namespace MonoDevelop.Xml.Editor
 
 		void UpdateErrors (List<Projects.BuildError> errors)
 		{
-			TaskService.Errors.ClearByOwner (this);
+			IdeServices.TaskService.Errors.ClearByOwner (this);
 			if (errors.Count == 0)
 				return;
 			foreach (var error in errors) {
-				TaskService.Errors.Add (new TaskListEntry (error) {
+				IdeServices.TaskService.Errors.Add (new TaskListEntry (error) {
 					WorkspaceObject = DocumentContext.Project,
 					Owner = this
 				});
 			}
-			TaskService.ShowErrors ();
+			IdeServices.TaskService.ShowErrors ();
 		}
 		
 		[CommandHandler (XmlCommands.AssignStylesheet)]
diff --git a/main/src/addins/Xml/Formatting/XmlFormatter.cs b/main/src/addins/Xml/Formatting/XmlFormatter.cs
index 05eab308ce..b8b4f5b1ca 100644
--- a/main/src/addins/Xml/Formatting/XmlFormatter.cs
+++ b/main/src/addins/Xml/Formatting/XmlFormatter.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // XmlFormatter.cs
 //  
 // Author:
@@ -71,7 +71,7 @@ namespace MonoDevelop.Xml.Formatting
 		{
 			if (policyParent == null)
 				policyParent = PolicyService.DefaultPolicies;
-			var mimeTypeInheritanceChain = DesktopService.GetMimeTypeInheritanceChain (mimeType).ToList ();
+			var mimeTypeInheritanceChain = IdeServices.DesktopService.GetMimeTypeInheritanceChain (mimeType).ToList ();
 			var txtPol = policyParent.Get<TextStylePolicy> (mimeTypeInheritanceChain);
 			var xmlPol = policyParent.Get<XmlFormattingPolicy> (mimeTypeInheritanceChain);
 			return new StringTextSource(FormatXml (txtPol, xmlPol, input.Text));