diff --git a/src/OneWare.Core/Extensions/TextMate/CustomTextMateRegistryOptions.cs b/src/OneWare.Core/Extensions/TextMate/CustomTextMateRegistryOptions.cs
index 180896ee..48206ae7 100644
--- a/src/OneWare.Core/Extensions/TextMate/CustomTextMateRegistryOptions.cs
+++ b/src/OneWare.Core/Extensions/TextMate/CustomTextMateRegistryOptions.cs
@@ -26,7 +26,7 @@ public void RegisterLanguage(string id, string grammarPath, params string[] exte
     
     public IRawGrammar GetGrammar(string scopeName)
     {
-        var g = _availableLanguages.FirstOrDefault(x => x.Id == scopeName);
+        var g = _availableLanguages.FirstOrDefault(x => x.Id == scopeName.Split('.').Last());
         
         if (g == null) return _defaultRegistryOptions.GetGrammar(scopeName);
         using var s = new StreamReader(AssetLoader.Open(new Uri(g.GrammarPath)));
@@ -54,7 +54,8 @@ public ICollection<string> GetInjections(string scopeName)
     public string GetScopeByLanguageId(string languageId)
     {
         var r = _availableLanguages.FirstOrDefault(x => x.Id == languageId);
-        return r?.Id ?? _defaultRegistryOptions.GetScopeByLanguageId(languageId);
+        if (r != null) return $"source.{r.Id}";
+        return _defaultRegistryOptions.GetScopeByLanguageId(languageId);
     }
     
     public IRawTheme GetDefaultTheme()
diff --git a/src/OneWare.Verilog/VerilogModule.cs b/src/OneWare.Verilog/VerilogModule.cs
index b38f6854..3ba65749 100644
--- a/src/OneWare.Verilog/VerilogModule.cs
+++ b/src/OneWare.Verilog/VerilogModule.cs
@@ -13,6 +13,6 @@ public void RegisterTypes(IContainerRegistry containerRegistry)
 
     public void OnInitialized(IContainerProvider containerProvider)
     {
-        containerProvider.Resolve<ILanguageManager>().RegisterTextMateLanguage("source.verilog", "avares://OneWare.Verilog/Assets/verilog.tmLanguage.json", ".v");
+        containerProvider.Resolve<ILanguageManager>().RegisterTextMateLanguage("verilog", "avares://OneWare.Verilog/Assets/verilog.tmLanguage.json", ".v");
     }
 }
\ No newline at end of file
diff --git a/src/OneWare.Vhdl/VhdlModule.cs b/src/OneWare.Vhdl/VhdlModule.cs
index b54b3920..af3ca602 100644
--- a/src/OneWare.Vhdl/VhdlModule.cs
+++ b/src/OneWare.Vhdl/VhdlModule.cs
@@ -14,7 +14,7 @@ public void RegisterTypes(IContainerRegistry containerRegistry)
     public void OnInitialized(IContainerProvider containerProvider)
     {
         containerProvider.Resolve<IErrorService>().RegisterErrorSource("VHDL LS");
-        containerProvider.Resolve<ILanguageManager>().RegisterTextMateLanguage("source.vhdl", "avares://OneWare.Vhdl/Assets/vhdl.tmLanguage.json", ".vhd", ".vhdl");
+        containerProvider.Resolve<ILanguageManager>().RegisterTextMateLanguage("vhdl", "avares://OneWare.Vhdl/Assets/vhdl.tmLanguage.json", ".vhd", ".vhdl");
         containerProvider.Resolve<ILanguageManager>().RegisterService(typeof(LanguageServiceVhdl),true, ".vhd", ".vhdl");
     }
 }
\ No newline at end of file