diff --git a/CHANGELOG.md b/CHANGELOG.md
index a60c7b19d..2adbdc846 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2794,7 +2794,7 @@ Major version of SWF to XML export changed to 2.
 - [#382],[#396] AS3: Adding new trait (method/slot/const)
 - AS3: Highlighting pair parenthesis/bracket
 - AS3: Editing various new P-code parameters
-- AS3: Highligting of trait names/types/parameters
+- AS3: Highlighting of trait names/types/parameters
 - AS3: Global rename identifier for traits
 - [#357] Playback controls for DefineSound
 - [#391] AS3: Native methods mark
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/components/Markers.java b/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/components/Markers.java
index e8979673c..db10bf00b 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/components/Markers.java
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/java/jsyntaxpane/components/Markers.java
@@ -27,7 +27,7 @@ import jsyntaxpane.SyntaxDocument;
 import jsyntaxpane.Token;
 
 /**
- * This class contains static utility methods to make highliting in text 
+ * This class contains static utility methods to make highlighting in text 
  * components easier.
  * 
  * @author Ayman Al-Sairafi
diff --git a/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java b/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java
index 0740c49ba..858f7a005 100644
--- a/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java
+++ b/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java
@@ -172,7 +172,7 @@ public class UndoFixedEditorPane extends JEditorPane {
 
                 sw.stop();
                 if (!plain && sw.getElapsedMilliseconds() > 5000) {
-                    Logger.getLogger(UndoFixedEditorPane.class.getName()).log(Level.WARNING, "Syntax highlightig took long time. You can try to decrease the syntax highlight limit in advanced settings.");
+                    Logger.getLogger(UndoFixedEditorPane.class.getName()).log(Level.WARNING, "Syntax highlighting took long time. You can try to decrease the syntax highlight limit in advanced settings.");
                 }
 
                 clearUndos();