diff --git a/editor/editor2/AMXX_Edit_v2.dof b/editor/editor2/AMXX_Edit_v2.dof
index 90c923e0..f38f9e1f 100755
--- a/editor/editor2/AMXX_Edit_v2.dof
+++ b/editor/editor2/AMXX_Edit_v2.dof
@@ -110,12 +110,12 @@ ActiveLang=
 ProjectLang=
 RootDir=
 [Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
+IncludeVerInfo=1
+AutoIncBuild=1
+MajorVer=2
+MinorVer=1
 Release=0
-Build=0
+Build=2
 Debug=0
 PreRelease=0
 Special=0
@@ -125,12 +125,12 @@ Locale=1031
 CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X
-FileDescription=
-FileVersion=1.0.0.0
+FileDescription=Final
+FileVersion=2.1.0.2
 InternalName=
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=AMXX-Edit v2
+ProductVersion=2.1.0.0
 Comments=
diff --git a/editor/editor2/AMXX_Edit_v2.res b/editor/editor2/AMXX_Edit_v2.res
index 815765fe..69177110 100755
Binary files a/editor/editor2/AMXX_Edit_v2.res and b/editor/editor2/AMXX_Edit_v2.res differ
diff --git a/editor/editor2/UnitFunc.pas b/editor/editor2/UnitFunc.pas
index fa9d89bc..d9b8c98e 100755
--- a/editor/editor2/UnitFunc.pas
+++ b/editor/editor2/UnitFunc.pas
@@ -215,6 +215,8 @@ begin
       TSciStyle(Items[4]).ForeColor := frmSettings.cboKeywords.Selected;
       TSciStyle(Items[5]).ForeColor := frmSettings.cboComments.Selected;
       TSciStyle(Items[6]).ForeColor := TSciStyle(Items[2]).ForeColor;
+      TSciStyle(Items[7]).ForeColor := frmSettings.cboComments.Selected;
+      TSciStyle(Items[8]).ForeColor := frmSettings.cboComments.Selected;
     end;
     frmMain.sciEditor.Caret.LineBackColor := frmSettings.cboActiveLine.Selected;
 
diff --git a/editor/editor2/UnitfrmMain.dfm b/editor/editor2/UnitfrmMain.dfm
index 4721a5ac..abfe7821 100755
--- a/editor/editor2/UnitfrmMain.dfm
+++ b/editor/editor2/UnitfrmMain.dfm
@@ -1,6 +1,6 @@
 object frmMain: TfrmMain
-  Left = 222
-  Top = 277
+  Left = 224
+  Top = 333
   Width = 870
   Height = 640
   Color = clBtnFace
@@ -233,7 +233,7 @@ object frmMain: TfrmMain
               FontStyles = []
               ForeColor = clGreen
               CharCase = CASE_MIXED
-              Name = 'Line Comment'
+              Name = 'Comment 1'
               StyleNumber = 2
             end
             item
@@ -243,6 +243,20 @@ object frmMain: TfrmMain
               CharCase = CASE_MIXED
               Name = 'Brackets'
               StyleNumber = 34
+            end
+            item
+              FontSize = 0
+              FontStyles = []
+              CharCase = CASE_MIXED
+              Name = 'Comment 2'
+              StyleNumber = 1
+            end
+            item
+              FontSize = 0
+              FontStyles = []
+              CharCase = CASE_MIXED
+              Name = 'Comment 3'
+              StyleNumber = 3
             end>
           Keywords = <
             item
@@ -1555,7 +1569,7 @@ object frmMain: TfrmMain
           CommentStreamEnd = '*/'
           NumStyleBits = 5
         end>
-      LanguageManager.SelectedLanguage = 'null'
+      LanguageManager.SelectedLanguage = 'SMALL'
       FoldDrawFlags = [sciBelowIfNotExpanded]
       KeyCommands = <
         item