diff --git a/Build/ScintillaNET.3.5.dll b/Build/ScintillaNET.3.5.dll
index 555afd43..54055756 100644
Binary files a/Build/ScintillaNET.3.5.dll and b/Build/ScintillaNET.3.5.dll differ
diff --git a/Build/Scripting/ZDoom_DECORATE.cfg b/Build/Scripting/ZDoom_DECORATE.cfg
index cd4a403c..3e6e7b71 100644
--- a/Build/Scripting/ZDoom_DECORATE.cfg
+++ b/Build/Scripting/ZDoom_DECORATE.cfg
@@ -135,6 +135,7 @@ keywords
 	A_CheckRange = "A_CheckRange(float distance, int offset OR str state[, bool 2d_check])";
 	A_CheckSight = "A_CheckSight(int offset OR str state)";
 	A_CheckSightOrRange = "A_CheckSightOrRange(float distance, int offset OR str state[, bool 2d_check])";
+	A_CheckSpecies = "A_CheckSpecies(str jump[, str species=\"None\"[, int pointer = AAPTR_DEFAULT]]) ";
 	A_Jump = "A_Jump(int chance, int offset OR str state, ...)";
 	A_JumpIf = "A_JumpIf(expression, int offset OR str state)";
 	A_JumpIfArmorType = "A_JumpIfArmorType(str armortype, str state[, int minimum])";
@@ -161,6 +162,7 @@ keywords
 	A_FadeIn = "A_FadeIn[(float increase_amount = 0.1[, int flags = 0])]\nflags: FTF flags.";
 	A_FadeOut = "A_FadeOut[(float reduce_amount = 0.1[, int flags = FTF_REMOVE])]\nflags: FTF flags.";
 	A_FadeTo = "A_FadeTo(float target[, float amount = 0.1[, int flags = 0]])\nflags: FTF flags.";
+	A_FaceMovementDirection = "A_FaceMovementDirection([float offset = 0[, float anglelimit = 0[, float pitchlimit = 0[, int flags = 0[, int pointer = AAPTR_DEFAULT]]]]])";
 	A_Fall = "A_Fall";
 	A_Gravity = "A_Gravity";
 	A_HideThing = "A_HideThing";
@@ -183,7 +185,7 @@ keywords
 	A_SetHealth = "A_SetHealth(int health[, int pointer = AAPTR_DEFAULT])\nhealth: The health value to set for the actor. Valid values are 1 and above.\npointer: The actor to set its health. Default is AAPTR_DEFAULT, which corresponds to the calling actor.";
 	A_SetInvulnerable = "A_SetInvulnerable";
 	A_SetMass = "A_SetMass(int mass)";
-	A_SetPainThreshold = "A_SetPainThreshold(int threshold[, int ptr])"; 
+	A_SetPainThreshold = "A_SetPainThreshold(int threshold[, int pointer = AAPTR_DEFAULT])"; 
 	A_SetPitch = "A_SetPitch(float pitch[, int flags = 0[, int pointer = AAPTR_DEFAULT]])\npitch: The actor's new pitch, in degrees.\nflags: SPF flags.";
 	A_SetReflective = "A_SetReflective";
 	A_SetReflectiveInvulnerable = "A_SetReflectiveInvulnerable";
@@ -1054,6 +1056,9 @@ constants
 	DMSS_EXFILTER;
 	DMSS_EXSPECIES;
 	DMSS_EITHER;
+	FMDF_NOPITCH;
+	FMDF_NOANGLE;
+	FMDF_INTERPOLATE;
 	FPF_AIMATANGLE;
 	FPF_TRANSFERTRANSLATION;
 	FPF_NOAUTOAIM;
diff --git a/Source/Core/Controls/ScriptEditorControl.cs b/Source/Core/Controls/ScriptEditorControl.cs
index 1e8037a8..d0e2d818 100644
--- a/Source/Core/Controls/ScriptEditorControl.cs
+++ b/Source/Core/Controls/ScriptEditorControl.cs
@@ -308,6 +308,10 @@ namespace CodeImp.DoomBuilder.Controls
 					break;
 				}
 			}
+
+			//mxd. Reset document slyle
+			scriptedit.ClearDocumentStyle();
+			scriptedit.StyleResetDefault();
 			
 			// Check if specified lexer exists and set the lexer to use
 			string lexername = "lexer" + (int)scriptconfig.Lexer;
@@ -512,7 +516,6 @@ namespace CodeImp.DoomBuilder.Controls
 			}
 
 			// Rearrange the layout
-			scriptedit.ClearDocumentStyle();
 			this.PerformLayout();
 		}