diff --git a/PowerEditor/installer/APIs/html.xml b/PowerEditor/installer/APIs/html.xml
index da26f30e..4b8d9005 100644
--- a/PowerEditor/installer/APIs/html.xml
+++ b/PowerEditor/installer/APIs/html.xml
@@ -174,8 +174,6 @@
 		<KeyWord name="expanded" />
 		<KeyWord name="extra-condensed" />
 		<KeyWord name="extra-expanded" />
-		<KeyWord name="far-left" />
-		<KeyWord name="far-right" />
 		<KeyWord name="fast" />
 		<KeyWord name="faster" />
 		<KeyWord name="fieldset" />
diff --git a/PowerEditor/installer/nsisInclude/autoCompletion.nsh b/PowerEditor/installer/nsisInclude/autoCompletion.nsh
index a4e8c8fe..70062c59 100644
--- a/PowerEditor/installer/nsisInclude/autoCompletion.nsh
+++ b/PowerEditor/installer/nsisInclude/autoCompletion.nsh
@@ -30,126 +30,151 @@ SectionGroup "Auto-completion Files" autoCompletionComponent
 	SetOverwrite off
 	
 	${MementoSection} "C" C
+		Delete "$INSTDIR\plugins\APIs\c.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\c.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "C++" C++
+		Delete "$INSTDIR\plugins\APIs\cpp.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\cpp.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "Java" Java
+		Delete "$INSTDIR\plugins\APIs\java.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\java.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "C#" C#
+		Delete "$INSTDIR\plugins\APIs\cs.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\cs.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "HTML" HTML
+		Delete "$INSTDIR\plugins\APIs\html.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\html.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "RC" RC
+		Delete "$INSTDIR\plugins\APIs\rc.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\rc.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "SQL" SQL
+		Delete "$INSTDIR\plugins\APIs\sql.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\sql.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "PHP" PHP
+		Delete "$INSTDIR\plugins\APIs\php.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\php.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "CSS" CSS
+		Delete "$INSTDIR\plugins\APIs\css.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\css.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "VB" VB
+		Delete "$INSTDIR\plugins\APIs\vb.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\vb.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "Perl" Perl
+		Delete "$INSTDIR\plugins\APIs\perl.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\perl.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "JavaScript" JavaScript
+		Delete "$INSTDIR\plugins\APIs\javascript.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\javascript.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "Python" Python
+		Delete "$INSTDIR\plugins\APIs\python.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\python.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "ActionScript" ActionScript
+		Delete "$INSTDIR\plugins\APIs\actionscript.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\actionscript.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "LISP" LISP
+		Delete "$INSTDIR\plugins\APIs\lisp.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\lisp.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "VHDL" VHDL
+		Delete "$INSTDIR\plugins\APIs\vhdl.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\vhdl.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "TeX" TeX
+		Delete "$INSTDIR\plugins\APIs\tex.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\tex.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "DocBook" DocBook
+		Delete "$INSTDIR\plugins\APIs\xml.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\xml.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "NSIS" NSIS
+		Delete "$INSTDIR\plugins\APIs\nsis.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\nsis.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "CMAKE" CMAKE
+		Delete "$INSTDIR\plugins\APIs\cmake.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\cmake.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "BATCH" BATCH
+		Delete "$INSTDIR\plugins\APIs\batch.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\batch.xml"
 	${MementoSectionEnd}
 	
 	${MementoSection} "CoffeeScript" CoffeeScript
+		Delete "$INSTDIR\plugins\APIs\coffee.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\coffee.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "BaanC" BaanC
+		Delete "$INSTDIR\plugins\APIs\baanc.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\baanc.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "Lua" Lua
+		Delete "$INSTDIR\plugins\APIs\lua.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\lua.xml"
 	${MementoSectionEnd}
 
 	${MementoSection} "AutoIt" AutoIt
+		Delete "$INSTDIR\plugins\APIs\autoit.xml"
 		SetOutPath "$INSTDIR\autoCompletion"
 		File ".\APIs\autoit.xml"
 	${MementoSectionEnd}