diff --git a/vscode-extension/package.json b/vscode-extension/package.json
index a0081910..6e53ea94 100644
--- a/vscode-extension/package.json
+++ b/vscode-extension/package.json
@@ -684,6 +684,35 @@
 					}
 				}
 			}
+		],
+		"languages": [
+			{
+				"id": "ilspy-code-cs",
+				"aliases": [
+					"ILSpy (C#)"
+				],
+				"icon": {
+					"light": "resources/il-spy-modern-icon.svg",
+					"dark": "resources/il-spy-modern-icon-dark.svg"
+				}
+			},
+			{
+				"id": "ilspy-code-il",
+				"aliases": [
+					"ILSpy (IL)"
+				],
+				"icon": {
+					"light": "resources/il-spy-modern-icon.svg",
+					"dark": "resources/il-spy-modern-icon-dark.svg"
+				}
+			}
+		],
+		"grammars": [
+			{
+				"language": "ilspy-code-cs",
+				"scopeName": "source.ilspy-code-cs",
+				"path": "resources/ilspy-code-cs.tmLanguage.json"
+			}
 		]
 	},
 	"scripts": {
diff --git a/vscode-extension/resources/il-spy-modern-icon-dark.svg b/vscode-extension/resources/il-spy-modern-icon-dark.svg
new file mode 100644
index 00000000..99a06359
--- /dev/null
+++ b/vscode-extension/resources/il-spy-modern-icon-dark.svg
@@ -0,0 +1,104 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100%" viewBox="0 0 1024 1024" enable-background="new 0 0 1024 1024" xml:space="preserve">
+<path fill="#d7dae0" opacity="1.000000" stroke="none" 
+	d="
+M615.323730,568.913818 
+	C611.693909,595.956604 603.046631,620.780396 588.315125,643.239563 
+	C559.168640,687.675415 518.387329,714.925049 465.806366,723.068726 
+	C421.296631,729.962402 379.800690,720.732666 342.072479,695.819885 
+	C338.540009,693.487366 336.304443,693.244507 333.237000,696.552856 
+	C326.330292,704.002197 319.065186,711.124084 311.827118,718.258728 
+	C309.189484,720.858643 308.349579,722.605164 311.493347,725.911621 
+	C319.916534,734.770569 319.410980,745.830811 310.876434,754.386047 
+	C264.157959,801.217834 217.412720,848.023010 170.762665,894.922913 
+	C164.522491,901.196350 157.742783,905.635315 148.489838,905.393127 
+	C141.648819,905.214050 135.673767,902.909119 130.916458,898.190430 
+	C114.945877,882.349426 99.014442,866.463257 83.359917,850.311523 
+	C73.744911,840.391113 74.197197,824.085571 84.130684,813.621033 
+	C91.125046,806.252808 98.538399,799.283325 105.734238,792.105286 
+	C145.255493,752.681702 184.767136,713.248596 224.283768,673.820374 
+	C225.463287,672.643494 226.639069,671.461365 227.855194,670.322998 
+	C237.218536,661.557861 247.148468,661.650452 255.750809,671.082214 
+	C258.834778,674.463562 260.711487,674.258240 263.675720,671.162903 
+	C271.279968,663.222168 279.093842,655.479187 286.939789,647.775024 
+	C289.169708,645.585388 289.710815,643.878784 287.803589,640.982300 
+	C273.555359,619.343811 264.998352,595.408264 261.909912,569.860657 
+	C255.747360,518.883972 268.044220,472.560455 300.562500,432.548584 
+	C328.773651,397.836456 365.441376,376.358978 409.794403,369.957672 
+	C506.519531,355.997589 591.707520,415.816650 612.946472,507.974701 
+	C617.527649,527.852966 617.625183,548.177002 615.323730,568.913818 
+M568.025146,583.618103 
+	C573.109131,566.173462 574.799255,548.406616 572.558105,530.372070 
+	C568.797607,500.112274 556.218811,473.738556 534.916870,452.176941 
+	C500.897095,417.742645 459.025085,405.894714 411.954926,414.425049 
+	C335.150970,428.343933 290.050507,503.345734 307.912476,578.336914 
+	C324.142181,646.475342 389.149017,690.381409 458.450531,679.168518 
+	C513.467102,670.266968 550.007812,637.522461 568.025146,583.618103 
+z"/>
+<path fill="#d7dae0" opacity="1.000000" stroke="none" 
+	d="
+M833.999878,628.353210 
+	C759.876343,628.353271 686.252869,628.353271 612.957275,628.353271 
+	C611.923706,626.575806 612.625061,625.544495 613.066223,624.501404 
+	C617.869629,613.142090 621.913147,601.522644 624.566345,589.470947 
+	C625.197510,586.603760 626.531738,585.487183 629.319275,585.644958 
+	C630.980164,585.739014 632.651062,585.650940 634.317505,585.650940 
+	C716.472351,585.649536 798.627258,585.650330 880.782104,585.646729 
+	C893.862427,585.646118 899.914795,579.488281 899.631958,566.232788 
+	C897.559753,469.099182 899.048096,371.956390 898.863159,274.818054 
+	C898.859070,272.664307 899.018677,270.489960 899.332520,268.359222 
+	C901.034119,256.806213 893.883301,248.382004 882.188965,248.378326 
+	C829.363220,248.361725 776.537476,248.378876 723.711731,248.379501 
+	C610.394653,248.380844 497.077606,248.377274 383.760529,248.394821 
+	C381.439117,248.395172 379.038696,248.291046 376.810699,248.813690 
+	C368.990479,250.648132 365.187073,255.925156 365.191895,264.544250 
+	C365.210144,297.206116 365.144470,329.868622 365.374725,362.529053 
+	C365.407837,367.222412 364.009277,369.676422 359.618896,371.460480 
+	C348.800812,375.856598 338.603607,381.527374 328.825592,387.931946 
+	C327.601776,388.733612 326.445160,389.767090 324.775330,389.815338 
+	C322.997955,388.426849 323.687653,386.451080 323.685913,384.756195 
+	C323.643890,343.762115 323.556030,302.767639 323.690674,261.773987 
+	C323.784943,233.071533 344.111176,209.780457 372.203308,205.818619 
+	C374.005402,205.564484 375.862183,205.657074 377.693512,205.657028 
+	C546.669250,205.652588 715.644958,205.648651 884.620728,205.662262 
+	C915.928345,205.664795 940.316284,230.087341 940.322388,261.463898 
+	C940.342407,364.615753 940.343079,467.767578 940.321350,570.919434 
+	C940.314392,604.152832 916.175842,628.303467 882.990723,628.355469 
+	C866.827209,628.380798 850.663513,628.355530 833.999878,628.353210 
+z"/>
+<path fill="#d7dae0" opacity="1.000000" stroke="none" 
+	d="
+M292.141266,422.134155 
+	C285.412079,430.450684 279.508698,438.913971 274.487976,447.956940 
+	C273.081818,450.489655 271.277771,451.401825 268.465118,451.352814 
+	C260.969299,451.222137 253.461624,451.511047 245.975052,451.216644 
+	C242.045486,451.062134 240.440445,452.691711 239.376129,456.238342 
+	C228.025406,494.062286 202.221237,516.291443 163.722824,521.925232 
+	C123.487221,527.813232 84.311180,506.613220 67.887451,468.485901 
+	C43.793152,412.551575 76.059570,351.070343 135.516998,340.068298 
+	C177.129471,332.368286 221.051941,354.911133 237.204529,397.716309 
+	C239.249313,403.135132 241.820847,404.946045 247.598389,404.809937 
+	C265.250702,404.393982 282.919006,404.657837 300.581085,404.657196 
+	C302.514282,404.657135 304.447449,404.657166 307.800537,404.657166 
+	C301.998199,411.122589 297.180908,416.490448 292.141266,422.134155 
+M190.935242,461.431702 
+	C202.880997,445.359528 205.432037,427.871277 196.988739,409.733551 
+	C188.655624,391.832550 174.090240,382.068604 154.108551,381.018646 
+	C130.984253,379.803528 110.038589,394.875702 103.764336,417.181335 
+	C97.455528,439.609772 107.616844,463.860504 127.911537,474.810181 
+	C149.292038,486.345734 172.785156,481.542877 190.935242,461.431702 
+z"/>
+<path fill="#d7dae0" opacity="1.000000" stroke="none" 
+	d="
+M351.023865,544.577026 
+	C386.500244,544.423950 421.480835,544.182312 456.461670,544.151733 
+	C478.939911,544.132080 501.418274,544.443420 523.896851,544.563293 
+	C531.048950,544.601501 538.178894,543.785034 545.363831,544.410645 
+	C548.506226,544.684204 549.350281,545.796448 549.195312,548.694214 
+	C546.555664,598.044922 516.002258,638.233337 469.288300,652.403687 
+	C408.727631,670.774353 345.023102,632.945129 331.641571,570.942200 
+	C330.133331,563.953735 329.318176,556.890747 328.632721,549.787659 
+	C328.220917,545.520142 330.196259,544.112793 334.051361,544.215759 
+	C339.542969,544.362427 345.035889,544.459595 351.023865,544.577026 
+z"/>
+</svg>
\ No newline at end of file
diff --git a/vscode-extension/resources/ilspy-code-cs.tmLanguage.json b/vscode-extension/resources/ilspy-code-cs.tmLanguage.json
new file mode 100644
index 00000000..b4883dd6
--- /dev/null
+++ b/vscode-extension/resources/ilspy-code-cs.tmLanguage.json
@@ -0,0 +1,8 @@
+{
+	"scopeName": "source.ilspy-code-cs",
+	"patterns": [
+		{
+			"include": "source.cs"
+		}
+	]
+}
\ No newline at end of file
diff --git a/vscode-extension/src/decompiler/languageInfos.ts b/vscode-extension/src/decompiler/languageInfos.ts
index c5ef7998..a29bda8c 100644
--- a/vscode-extension/src/decompiler/languageInfos.ts
+++ b/vscode-extension/src/decompiler/languageInfos.ts
@@ -1,5 +1,8 @@
 import { LanguageName } from "../protocol/LanguageName";
 
+const ILSPY_CODE_CS_LANG = "ilspy-code-cs";
+const ILSPY_CODE_IL_LANG = "ilspy-code-il";
+
 export interface LanguageInfo {
   name: LanguageName;
   displayName: string;
@@ -7,91 +10,95 @@ export interface LanguageInfo {
 }
 
 export const languageInfos = createLanguageMap([
-  { name: LanguageName.IL, displayName: "IL", vsLanguageMode: "il" },
+  {
+    name: LanguageName.IL,
+    displayName: "IL",
+    vsLanguageMode: ILSPY_CODE_IL_LANG,
+  },
   {
     name: LanguageName.CSharp_1,
     displayName: "C# 1.0 / VS .NET",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_2,
     displayName: "C# 2.0 / VS 2005",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_3,
     displayName: "C# 3.0 / VS 2008",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_4,
     displayName: "C# 4.0 / VS 2010",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_5,
     displayName: "C# 5.0 / VS 2012",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_6,
     displayName: "C# 6.0 / VS 2015",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_7,
     displayName: "C# 7.0 / VS 2017",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_7_1,
     displayName: "C# 7.1 / VS 2017.3",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_7_2,
     displayName: "C# 7.2 / VS 2017.4",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_7_3,
     displayName: "C# 7.3 / VS 2017.7",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_8,
     displayName: "C# 8.0 / VS 2019",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_9,
     displayName: "C# 9.0 / VS 2019.8",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_10,
     displayName: "C# 10.0 / VS 2022",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_11,
     displayName: "C# 11.0 / VS 2022.4",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_12,
     displayName: "C# 12.0 / VS 2022.8",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_13,
     displayName: "C# 13.0 / VS 2022.12",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
   {
     name: LanguageName.CSharp_14,
     displayName: "C# 14.0 / VS 2026",
-    vsLanguageMode: "csharp",
+    vsLanguageMode: ILSPY_CODE_CS_LANG,
   },
 ]);