diff --git a/xasm.properties b/xasm.properties
index 909f64d..a1aa219 100644
--- a/xasm.properties
+++ b/xasm.properties
@@ -1,10 +1,12 @@
-# xasm settings for SciTE (http://www.scintilla.org/SciTE.html)
+# xasm settings for SciTE (http://www.scintilla.org/SciTE.html)
 
-file.patterns.asx=*.asx
-filter.asx=xasm (asx)|$(file.patterns.asm)|
-lexer.$(file.patterns.asx)=asm
+file.patterns.xasm=*.asx
+filter.xasm=xasm (asx)|$(file.patterns.xasm)|
+*filter.xasm=$(filter.xasm)
+lexer.$(file.patterns.xasm)=asm
+*language.xasm=xasm|asx||
 
-keywords.$(file.patterns.asx)= \
+keywords.$(file.patterns.xasm)= \
 	adc add and asl bcc bcs beq bit \
 	bmi bne bpl brk bvc bvs clc cld \
 	cli clv cmp cpx cpy dec dex dey \
@@ -32,9 +34,9 @@ style.asm.7=
 style.asm.12=$(colour.char)
 style.asm.13=$(colour.error)
 
-command.compile.$(file.patterns.asx)=xasm /o:$(FileName).xex $(FilePath)
-command.build.$(file.patterns.asx)=make
+command.compile.$(file.patterns.xasm)=xasm /o:$(FileName).xex $(FilePath)
+command.build.$(file.patterns.xasm)=make
 if PLAT_WIN
-	command.go.$(file.patterns.asx)=start $(FileName).xex
+	command.go.$(file.patterns.xasm)=start $(FileName).xex
 if PLAT_GTK
-	command.go.$(file.patterns.asx)=atari800 -run $(FileName).xex
+	command.go.$(file.patterns.xasm)=atari800 -run $(FileName).xex