From 52e8c68f901e1dadaeb342bf38940779448277ec Mon Sep 17 00:00:00 2001
From: Don HO <don.h@free.fr>
Date: Mon, 4 Jan 2021 15:02:09 +0100
Subject: [PATCH] Change XML encoding from Windows-1252 to UTF-8 (config.xml
 and others)

and add XML declaration for session.xml, shortcuts.xml & userDefineLang.xml for conforming to XML standard specs.

Regarding the suggestions from #9339
---
 PowerEditor/bin/userDefineLang.xml            | 65 +++++++++++++++++++
 PowerEditor/installer/APIs/BaanC.xml          |  2 +-
 PowerEditor/installer/APIs/actionscript.xml   |  2 +-
 PowerEditor/installer/APIs/autoit.xml         |  2 +-
 PowerEditor/installer/APIs/batch.xml          |  2 +-
 PowerEditor/installer/APIs/c.xml              |  2 +-
 PowerEditor/installer/APIs/cmake.xml          |  2 +-
 PowerEditor/installer/APIs/cobol.xml          |  2 +-
 PowerEditor/installer/APIs/coffee.xml         |  2 +-
 PowerEditor/installer/APIs/cpp.xml            |  2 +-
 PowerEditor/installer/APIs/cs.xml             |  2 +-
 PowerEditor/installer/APIs/css.xml            |  2 +-
 PowerEditor/installer/APIs/html.xml           |  2 +-
 PowerEditor/installer/APIs/java.xml           |  2 +-
 PowerEditor/installer/APIs/javascript.xml     |  2 +-
 PowerEditor/installer/APIs/lisp.xml           |  2 +-
 PowerEditor/installer/APIs/lua.xml            |  2 +-
 PowerEditor/installer/APIs/nsis.xml           |  2 +-
 PowerEditor/installer/APIs/perl.xml           |  2 +-
 PowerEditor/installer/APIs/php.xml            |  2 +-
 PowerEditor/installer/APIs/python.xml         |  2 +-
 PowerEditor/installer/APIs/rc.xml             |  2 +-
 PowerEditor/installer/APIs/sql.xml            |  2 +-
 PowerEditor/installer/APIs/tex.xml            |  2 +-
 PowerEditor/installer/APIs/vb.xml             |  2 +-
 PowerEditor/installer/APIs/vhdl.xml           |  2 +-
 PowerEditor/installer/APIs/xml.xml            |  2 +-
 PowerEditor/installer/themes/Bespin.xml       |  2 +-
 PowerEditor/installer/themes/Black board.xml  |  2 +-
 PowerEditor/installer/themes/Choco.xml        |  2 +-
 .../installer/themes/DansLeRuSH-Dark.xml      |  2 +-
 PowerEditor/installer/themes/Deep Black.xml   |  2 +-
 PowerEditor/installer/themes/Hello Kitty.xml  |  2 +-
 .../installer/themes/HotFudgeSundae.xml       |  2 +-
 .../installer/themes/Mono Industrial.xml      |  2 +-
 PowerEditor/installer/themes/Monokai.xml      |  2 +-
 PowerEditor/installer/themes/MossyLawn.xml    |  2 +-
 PowerEditor/installer/themes/Navajo.xml       |  2 +-
 PowerEditor/installer/themes/Obsidian.xml     |  2 +-
 .../installer/themes/Plastic Code Wrap.xml    |  2 +-
 PowerEditor/installer/themes/Ruby Blue.xml    |  2 +-
 .../installer/themes/Solarized-light.xml      |  2 +-
 PowerEditor/installer/themes/Solarized.xml    |  2 +-
 PowerEditor/installer/themes/Twilight.xml     |  2 +-
 PowerEditor/installer/themes/Vibrant Ink.xml  |  2 +-
 PowerEditor/installer/themes/Zenburn.xml      |  2 +-
 PowerEditor/installer/themes/khaki.xml        |  2 +-
 .../installer/themes/vim Dark Blue.xml        |  2 +-
 PowerEditor/src/Parameters.cpp                | 11 +++-
 PowerEditor/src/config.4zipPackage.xml        |  2 +-
 PowerEditor/src/langs.model.xml               |  2 +-
 PowerEditor/src/shortcuts.xml                 | 12 +---
 PowerEditor/src/stylers.model.xml             |  2 +-
 PowerEditor/src/toolbarIcons.xml              |  2 +-
 PowerEditor/src/userDefineLang.xml            |  2 +-
 55 files changed, 128 insertions(+), 64 deletions(-)
 create mode 100644 PowerEditor/bin/userDefineLang.xml

diff --git a/PowerEditor/bin/userDefineLang.xml b/PowerEditor/bin/userDefineLang.xml
new file mode 100644
index 000000000..d89feb6f7
--- /dev/null
+++ b/PowerEditor/bin/userDefineLang.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<NotepadPlus>
+    <UserLang name="ggg" ext="" udlVersion="2.1">
+        <Settings>
+            <Global caseIgnored="no" allowFoldOfComments="no" foldCompact="no" forcePureLC="0" decimalSeparator="0" />
+            <Prefix Keywords1="no" Keywords2="no" Keywords3="no" Keywords4="no" Keywords5="no" Keywords6="no" Keywords7="no" Keywords8="no" />
+        </Settings>
+        <KeywordLists>
+            <Keywords name="Comments"></Keywords>
+            <Keywords name="Numbers, prefix1"></Keywords>
+            <Keywords name="Numbers, prefix2"></Keywords>
+            <Keywords name="Numbers, extras1"></Keywords>
+            <Keywords name="Numbers, extras2"></Keywords>
+            <Keywords name="Numbers, suffix1"></Keywords>
+            <Keywords name="Numbers, suffix2"></Keywords>
+            <Keywords name="Numbers, range"></Keywords>
+            <Keywords name="Operators1"></Keywords>
+            <Keywords name="Operators2"></Keywords>
+            <Keywords name="Folders in code1, open"></Keywords>
+            <Keywords name="Folders in code1, middle"></Keywords>
+            <Keywords name="Folders in code1, close"></Keywords>
+            <Keywords name="Folders in code2, open"></Keywords>
+            <Keywords name="Folders in code2, middle"></Keywords>
+            <Keywords name="Folders in code2, close"></Keywords>
+            <Keywords name="Folders in comment, open"></Keywords>
+            <Keywords name="Folders in comment, middle"></Keywords>
+            <Keywords name="Folders in comment, close"></Keywords>
+            <Keywords name="Keywords1"></Keywords>
+            <Keywords name="Keywords2"></Keywords>
+            <Keywords name="Keywords3"></Keywords>
+            <Keywords name="Keywords4"></Keywords>
+            <Keywords name="Keywords5"></Keywords>
+            <Keywords name="Keywords6"></Keywords>
+            <Keywords name="Keywords7"></Keywords>
+            <Keywords name="Keywords8"></Keywords>
+            <Keywords name="Delimiters"></Keywords>
+        </KeywordLists>
+        <Styles>
+            <WordsStyle name="DEFAULT" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="COMMENTS" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="LINE COMMENTS" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="NUMBERS" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS1" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS2" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS3" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS4" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS5" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS6" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS7" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="KEYWORDS8" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="OPERATORS" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="FOLDER IN CODE1" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="FOLDER IN CODE2" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="FOLDER IN COMMENT" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS1" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS2" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS3" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS4" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS5" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS6" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS7" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+            <WordsStyle name="DELIMITERS8" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="0" />
+        </Styles>
+    </UserLang>
+</NotepadPlus>
diff --git a/PowerEditor/installer/APIs/BaanC.xml b/PowerEditor/installer/APIs/BaanC.xml
index 87554a927..248bee518 100644
--- a/PowerEditor/installer/APIs/BaanC.xml
+++ b/PowerEditor/installer/APIs/BaanC.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete language="BaanC">
 		<Environment ignoreCase="yes" startFunc="(" stopFunc=")" paramSeparator="," additionalWordChar=".:$#" />
diff --git a/PowerEditor/installer/APIs/actionscript.xml b/PowerEditor/installer/APIs/actionscript.xml
index 8bb1517ff..8fbf502a9 100644
--- a/PowerEditor/installer/APIs/actionscript.xml
+++ b/PowerEditor/installer/APIs/actionscript.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name="&quot;allowscale&quot;" />
diff --git a/PowerEditor/installer/APIs/autoit.xml b/PowerEditor/installer/APIs/autoit.xml
index e9cddf055..fd8c7c70a 100644
--- a/PowerEditor/installer/APIs/autoit.xml
+++ b/PowerEditor/installer/APIs/autoit.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<Environment ignoreCase="yes" startFunc="(" stopFunc=")" paramSeparator="," terminal=";" additionalWordChar="@"/>
diff --git a/PowerEditor/installer/APIs/batch.xml b/PowerEditor/installer/APIs/batch.xml
index fccd22dd9..aaea70bfc 100644
--- a/PowerEditor/installer/APIs/batch.xml
+++ b/PowerEditor/installer/APIs/batch.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name="arp" />
diff --git a/PowerEditor/installer/APIs/c.xml b/PowerEditor/installer/APIs/c.xml
index 948988475..c4c60fef9 100644
--- a/PowerEditor/installer/APIs/c.xml
+++ b/PowerEditor/installer/APIs/c.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete language="C">
 		<Environment ignoreCase="no" startFunc="(" stopFunc=")" paramSeparator="," terminal=";" />
diff --git a/PowerEditor/installer/APIs/cmake.xml b/PowerEditor/installer/APIs/cmake.xml
index 99c4c4723..94ada7c69 100644
--- a/PowerEditor/installer/APIs/cmake.xml
+++ b/PowerEditor/installer/APIs/cmake.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<Environment ignoreCase="no" startFunc="(" stopFunc=")" paramSeparator="," terminal=";" />
diff --git a/PowerEditor/installer/APIs/cobol.xml b/PowerEditor/installer/APIs/cobol.xml
index 735cf92b2..aaac18b20 100644
--- a/PowerEditor/installer/APIs/cobol.xml
+++ b/PowerEditor/installer/APIs/cobol.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<Environment ignoreCase="yes" startFunc="(" stopFunc=")" paramSeparator="," additionalWordChar="-" />
 	<!-- note: this list was created using functions and reserved words known to GnuCOBOL (COBOL85,2002,2014 + extensions from IBM/MF/RM/ACUCOBOL) -->
diff --git a/PowerEditor/installer/APIs/coffee.xml b/PowerEditor/installer/APIs/coffee.xml
index dc6636a74..1f8079412 100644
--- a/PowerEditor/installer/APIs/coffee.xml
+++ b/PowerEditor/installer/APIs/coffee.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 		<AutoComplete>
 			<KeyWord name="arguments" />
diff --git a/PowerEditor/installer/APIs/cpp.xml b/PowerEditor/installer/APIs/cpp.xml
index 8705e7fad..515025d58 100644
--- a/PowerEditor/installer/APIs/cpp.xml
+++ b/PowerEditor/installer/APIs/cpp.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<!-- language doesnt really mean anything, its more of a comment -->
 	<AutoComplete language="C++">
diff --git a/PowerEditor/installer/APIs/cs.xml b/PowerEditor/installer/APIs/cs.xml
index b65c0ff84..e2a941041 100644
--- a/PowerEditor/installer/APIs/cs.xml
+++ b/PowerEditor/installer/APIs/cs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete language="C#">
 		<Environment ignoreCase="no" startFunc="(" stopFunc=")" paramSeparator="," terminal=";" additionalWordChar="."/>
diff --git a/PowerEditor/installer/APIs/css.xml b/PowerEditor/installer/APIs/css.xml
index 3699e8405..027b03aea 100644
--- a/PowerEditor/installer/APIs/css.xml
+++ b/PowerEditor/installer/APIs/css.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name=":active" />
diff --git a/PowerEditor/installer/APIs/html.xml b/PowerEditor/installer/APIs/html.xml
index 4b8d90057..bc9ac8ea8 100644
--- a/PowerEditor/installer/APIs/html.xml
+++ b/PowerEditor/installer/APIs/html.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name="!DOCTYPE html" />
diff --git a/PowerEditor/installer/APIs/java.xml b/PowerEditor/installer/APIs/java.xml
index c1367186f..abc174a3e 100644
--- a/PowerEditor/installer/APIs/java.xml
+++ b/PowerEditor/installer/APIs/java.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<Environment ignoreCase="no" startFunc="(" stopFunc=")" paramSeparator="," terminal=";" />
diff --git a/PowerEditor/installer/APIs/javascript.xml b/PowerEditor/installer/APIs/javascript.xml
index 2b90b8734..ade1643a8 100644
--- a/PowerEditor/installer/APIs/javascript.xml
+++ b/PowerEditor/installer/APIs/javascript.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name="above" />
diff --git a/PowerEditor/installer/APIs/lisp.xml b/PowerEditor/installer/APIs/lisp.xml
index 0811c97c5..aa08b39cd 100644
--- a/PowerEditor/installer/APIs/lisp.xml
+++ b/PowerEditor/installer/APIs/lisp.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name="*error*" />
diff --git a/PowerEditor/installer/APIs/lua.xml b/PowerEditor/installer/APIs/lua.xml
index 43d84d177..c18a34a4a 100644
--- a/PowerEditor/installer/APIs/lua.xml
+++ b/PowerEditor/installer/APIs/lua.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
     <Environment ignoreCase="yes" startFunc="(" stopFunc=")" paramSeparator="," terminal=";" additionalWordChar=".:" />
     <AutoComplete language="LUA">
diff --git a/PowerEditor/installer/APIs/nsis.xml b/PowerEditor/installer/APIs/nsis.xml
index 151745561..2e96ce251 100644
--- a/PowerEditor/installer/APIs/nsis.xml
+++ b/PowerEditor/installer/APIs/nsis.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name="!AddIncludeDir" />
diff --git a/PowerEditor/installer/APIs/perl.xml b/PowerEditor/installer/APIs/perl.xml
index 1bc95b86d..a0422e52b 100644
--- a/PowerEditor/installer/APIs/perl.xml
+++ b/PowerEditor/installer/APIs/perl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<Environment ignoreCase="no" startFunc="(" stopFunc=")" paramSeparator="," terminal=";" />
diff --git a/PowerEditor/installer/APIs/php.xml b/PowerEditor/installer/APIs/php.xml
index 9bc8d6363..053f95ee3 100644
--- a/PowerEditor/installer/APIs/php.xml
+++ b/PowerEditor/installer/APIs/php.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
 @author	 Geoffray Warnants - http://www.geoffray.be
 @version	1.35.20100625
diff --git a/PowerEditor/installer/APIs/python.xml b/PowerEditor/installer/APIs/python.xml
index 84ca0b735..d4baaa12e 100644
--- a/PowerEditor/installer/APIs/python.xml
+++ b/PowerEditor/installer/APIs/python.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 	<!--
 	@author Gregori Gerebtzoff
 	@version 1.2
diff --git a/PowerEditor/installer/APIs/rc.xml b/PowerEditor/installer/APIs/rc.xml
index de9c8d093..a85f04a86 100644
--- a/PowerEditor/installer/APIs/rc.xml
+++ b/PowerEditor/installer/APIs/rc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name="ACCELERATORS" />
diff --git a/PowerEditor/installer/APIs/sql.xml b/PowerEditor/installer/APIs/sql.xml
index d1d518d34..a9cef009b 100644
--- a/PowerEditor/installer/APIs/sql.xml
+++ b/PowerEditor/installer/APIs/sql.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete language="SQL">
 		<Environment ignoreCase="yes" startFunc="(" stopFunc=")" paramSeparator="," terminal=";" />
diff --git a/PowerEditor/installer/APIs/tex.xml b/PowerEditor/installer/APIs/tex.xml
index ffbcde38f..c2015ad23 100644
--- a/PowerEditor/installer/APIs/tex.xml
+++ b/PowerEditor/installer/APIs/tex.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<Environment ignoreCase="no" />
diff --git a/PowerEditor/installer/APIs/vb.xml b/PowerEditor/installer/APIs/vb.xml
index d9e1e9dcb..0286684cf 100644
--- a/PowerEditor/installer/APIs/vb.xml
+++ b/PowerEditor/installer/APIs/vb.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name="Abs" />
diff --git a/PowerEditor/installer/APIs/vhdl.xml b/PowerEditor/installer/APIs/vhdl.xml
index 41bafa855..7aff939de 100644
--- a/PowerEditor/installer/APIs/vhdl.xml
+++ b/PowerEditor/installer/APIs/vhdl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name="abs" />
diff --git a/PowerEditor/installer/APIs/xml.xml b/PowerEditor/installer/APIs/xml.xml
index cf72b873f..7b5e8edb3 100644
--- a/PowerEditor/installer/APIs/xml.xml
+++ b/PowerEditor/installer/APIs/xml.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
 	<AutoComplete>
 		<KeyWord name="abbrev" />
diff --git a/PowerEditor/installer/themes/Bespin.xml b/PowerEditor/installer/themes/Bespin.xml
index cd230ffe9..7d888f2d8 100644
--- a/PowerEditor/installer/themes/Bespin.xml
+++ b/PowerEditor/installer/themes/Bespin.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 
 Bespin
diff --git a/PowerEditor/installer/themes/Black board.xml b/PowerEditor/installer/themes/Black board.xml
index d8c7b8683..2eeff4a75 100644
--- a/PowerEditor/installer/themes/Black board.xml	
+++ b/PowerEditor/installer/themes/Black board.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 
 Blackboard
diff --git a/PowerEditor/installer/themes/Choco.xml b/PowerEditor/installer/themes/Choco.xml
index af407ab53..943f9706c 100644
--- a/PowerEditor/installer/themes/Choco.xml
+++ b/PowerEditor/installer/themes/Choco.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 
 choco
diff --git a/PowerEditor/installer/themes/DansLeRuSH-Dark.xml b/PowerEditor/installer/themes/DansLeRuSH-Dark.xml
index 7178c7d72..615f75dae 100644
--- a/PowerEditor/installer/themes/DansLeRuSH-Dark.xml
+++ b/PowerEditor/installer/themes/DansLeRuSH-Dark.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--// DansLeRuSH's dark theme for Notepad++ / Notepad plus plus
 
 [ LEGAL DISCLAIMER ] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
diff --git a/PowerEditor/installer/themes/Deep Black.xml b/PowerEditor/installer/themes/Deep Black.xml
index 20dc74c59..019756a7d 100644
--- a/PowerEditor/installer/themes/Deep Black.xml	
+++ b/PowerEditor/installer/themes/Deep Black.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
 Style Name:         Deep Black
 Description:        Based on the theme Port VibrantInk by tyler
diff --git a/PowerEditor/installer/themes/Hello Kitty.xml b/PowerEditor/installer/themes/Hello Kitty.xml
index 37ed66167..183b37538 100644
--- a/PowerEditor/installer/themes/Hello Kitty.xml	
+++ b/PowerEditor/installer/themes/Hello Kitty.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
 Theme name : Hello Kitty
 This theme is not complete. If you enhance it, please send it back to me :
diff --git a/PowerEditor/installer/themes/HotFudgeSundae.xml b/PowerEditor/installer/themes/HotFudgeSundae.xml
index 5e15e02b3..0d9b5e3a6 100644
--- a/PowerEditor/installer/themes/HotFudgeSundae.xml
+++ b/PowerEditor/installer/themes/HotFudgeSundae.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 File Name:           HotFudgeSundae.xml
 Style Name:          HotFudgeSundae
diff --git a/PowerEditor/installer/themes/Mono Industrial.xml b/PowerEditor/installer/themes/Mono Industrial.xml
index 420709a54..74573a17f 100644
--- a/PowerEditor/installer/themes/Mono Industrial.xml	
+++ b/PowerEditor/installer/themes/Mono Industrial.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 
 monoindustrial
diff --git a/PowerEditor/installer/themes/Monokai.xml b/PowerEditor/installer/themes/Monokai.xml
index 63756d2ff..b9d3c5030 100644
--- a/PowerEditor/installer/themes/Monokai.xml
+++ b/PowerEditor/installer/themes/Monokai.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 
 Monokai
diff --git a/PowerEditor/installer/themes/MossyLawn.xml b/PowerEditor/installer/themes/MossyLawn.xml
index bda008e27..6132beb6a 100644
--- a/PowerEditor/installer/themes/MossyLawn.xml
+++ b/PowerEditor/installer/themes/MossyLawn.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 File Name:           MossyLawn.xml
 Style Name:          MossyLawn
diff --git a/PowerEditor/installer/themes/Navajo.xml b/PowerEditor/installer/themes/Navajo.xml
index 8e5172ca6..2dfbc2d5a 100644
--- a/PowerEditor/installer/themes/Navajo.xml
+++ b/PowerEditor/installer/themes/Navajo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 File Name:           Navajo.xml
 Style Name:          Navajo
diff --git a/PowerEditor/installer/themes/Obsidian.xml b/PowerEditor/installer/themes/Obsidian.xml
index fe4d310bd..0be147147 100644
--- a/PowerEditor/installer/themes/Obsidian.xml
+++ b/PowerEditor/installer/themes/Obsidian.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
 Notepad++ Custom Style
 
diff --git a/PowerEditor/installer/themes/Plastic Code Wrap.xml b/PowerEditor/installer/themes/Plastic Code Wrap.xml
index 7a05a1e81..bbb21d9f9 100644
--- a/PowerEditor/installer/themes/Plastic Code Wrap.xml	
+++ b/PowerEditor/installer/themes/Plastic Code Wrap.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 
 PlasticCodeWrap
diff --git a/PowerEditor/installer/themes/Ruby Blue.xml b/PowerEditor/installer/themes/Ruby Blue.xml
index 1804db5b5..67a435a0d 100644
--- a/PowerEditor/installer/themes/Ruby Blue.xml	
+++ b/PowerEditor/installer/themes/Ruby Blue.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!-- 
 Notepad++ Custom stylers
 Style name: 		Port Ruby Blue
diff --git a/PowerEditor/installer/themes/Solarized-light.xml b/PowerEditor/installer/themes/Solarized-light.xml
index ffa40f372..44339b44e 100644
--- a/PowerEditor/installer/themes/Solarized-light.xml
+++ b/PowerEditor/installer/themes/Solarized-light.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 File Name:           Solarized-light.xml
 Style Name:          Solarized-light
diff --git a/PowerEditor/installer/themes/Solarized.xml b/PowerEditor/installer/themes/Solarized.xml
index 5a24ab94b..cd8934485 100644
--- a/PowerEditor/installer/themes/Solarized.xml
+++ b/PowerEditor/installer/themes/Solarized.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 File Name:           Solarized.xml
 Style Name:          Solarized
diff --git a/PowerEditor/installer/themes/Twilight.xml b/PowerEditor/installer/themes/Twilight.xml
index 223d27230..85f2d5746 100644
--- a/PowerEditor/installer/themes/Twilight.xml
+++ b/PowerEditor/installer/themes/Twilight.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 
 Twilight
diff --git a/PowerEditor/installer/themes/Vibrant Ink.xml b/PowerEditor/installer/themes/Vibrant Ink.xml
index 1e0c27533..bb6dad5ba 100644
--- a/PowerEditor/installer/themes/Vibrant Ink.xml	
+++ b/PowerEditor/installer/themes/Vibrant Ink.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!-- 
 Style Name: Port VibrantInk
 Description: Based on the Textmate theme VibrantInk (http://alternateidea.com/blog/articles/2006/01/03/textmate-vibrant-ink-theme-and-prototype-bundle) by Justin Palmer
diff --git a/PowerEditor/installer/themes/Zenburn.xml b/PowerEditor/installer/themes/Zenburn.xml
index 4fbe28be6..5c4de7b7b 100644
--- a/PowerEditor/installer/themes/Zenburn.xml
+++ b/PowerEditor/installer/themes/Zenburn.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
 File name:           Zenburn.xml
 Style Name:          Zenburn
diff --git a/PowerEditor/installer/themes/khaki.xml b/PowerEditor/installer/themes/khaki.xml
index 93ecef6ac..5ae748fec 100644
--- a/PowerEditor/installer/themes/khaki.xml
+++ b/PowerEditor/installer/themes/khaki.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--//
 File Name:           khaki.xml
 Style Name:          khaki
diff --git a/PowerEditor/installer/themes/vim Dark Blue.xml b/PowerEditor/installer/themes/vim Dark Blue.xml
index e8c450e46..78ca917ae 100644
--- a/PowerEditor/installer/themes/vim Dark Blue.xml	
+++ b/PowerEditor/installer/themes/vim Dark Blue.xml	
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
     <LexerStyles>
         <LexerType name="actionscript" desc="ActionScript" ext="">
diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
index 6f2b3b2c0..1d116b0a4 100644
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@@ -1215,7 +1215,7 @@ bool NppParameters::load()
 	
 	if (!loadOkay)
 	{
-		TiXmlDeclaration* decl = new TiXmlDeclaration(TEXT("1.0"), TEXT("Windows-1252"), TEXT(""));
+		TiXmlDeclaration* decl = new TiXmlDeclaration(TEXT("1.0"), TEXT("UTF-8"), TEXT(""));
 		_pXmlUserDoc->LinkEndChild(decl);
 	}
 	else
@@ -2746,6 +2746,7 @@ std::pair<unsigned char, unsigned char> NppParameters::feedUserLang(TiXmlNode *n
 bool NppParameters::importUDLFromFile(const generic_string& sourceFile)
 {
 	TiXmlDocument *pXmlUserLangDoc = new TiXmlDocument(sourceFile);
+
 	bool loadOkay = pXmlUserLangDoc->LoadFile();
 	if (loadOkay)
 	{
@@ -2960,6 +2961,8 @@ void NppParameters::writeDefaultUDL()
 		if (!_pXmlUserLangDoc)
 		{
 			_pXmlUserLangDoc = new TiXmlDocument(_userDefineLangPath);
+			TiXmlDeclaration* decl = new TiXmlDeclaration(TEXT("1.0"), TEXT("UTF-8"), TEXT(""));
+			_pXmlUserLangDoc->LinkEndChild(decl);
 			_pXmlUserLangDoc->InsertEndChild(TiXmlElement(TEXT("NotepadPlus")));
 		}
 
@@ -3152,6 +3155,10 @@ void NppParameters::writeSession(const Session & session, const TCHAR *fileName)
 	const TCHAR *pathName = fileName?fileName:_sessionPath.c_str();
 
 	_pXmlSessionDoc = new TiXmlDocument(pathName);
+
+	TiXmlDeclaration* decl = new TiXmlDeclaration(TEXT("1.0"), TEXT("UTF-8"), TEXT(""));
+	_pXmlSessionDoc->LinkEndChild(decl);
+
 	TiXmlNode *root = _pXmlSessionDoc->InsertEndChild(TiXmlElement(TEXT("NotepadPlus")));
 
 	if (root)
@@ -3238,6 +3245,8 @@ void NppParameters::writeShortcuts()
 	{
 		//do the treatment
 		_pXmlShortcutDoc = new TiXmlDocument(_shortcutsPath);
+		TiXmlDeclaration* decl = new TiXmlDeclaration(TEXT("1.0"), TEXT("UTF-8"), TEXT(""));
+		_pXmlShortcutDoc->LinkEndChild(decl);
 	}
 
 	TiXmlNode *root = _pXmlShortcutDoc->FirstChild(TEXT("NotepadPlus"));
diff --git a/PowerEditor/src/config.4zipPackage.xml b/PowerEditor/src/config.4zipPackage.xml
index fe02a49b0..97833e389 100644
--- a/PowerEditor/src/config.4zipPackage.xml
+++ b/PowerEditor/src/config.4zipPackage.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
     <GUIConfigs>
         <GUIConfig name="ToolBar" visible="yes">standard</GUIConfig>
diff --git a/PowerEditor/src/langs.model.xml b/PowerEditor/src/langs.model.xml
index 52a455dde..5ff68a464 100644
--- a/PowerEditor/src/langs.model.xml
+++ b/PowerEditor/src/langs.model.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
    <!-- The key words of the supported languages, don't touch them! -->
    <Languages>
diff --git a/PowerEditor/src/shortcuts.xml b/PowerEditor/src/shortcuts.xml
index 47732e70b..152d4c938 100644
--- a/PowerEditor/src/shortcuts.xml
+++ b/PowerEditor/src/shortcuts.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
     <InternalCommands />
     <Macros>
@@ -7,17 +8,6 @@
         </Macro>
     </Macros>
     <UserDefinedCommands>
-		<!--
-		The following shortcuts are dangerous if your computer is compromised.
-		(But if your computer is compromised, EVERYTHING IS DANGEROUS!)
-		Remove the comment and use them at your own risk!!!
-
-        <Command name="Launch in Firefox" Ctrl="yes" Alt="yes" Shift="yes" Key="88">firefox &quot;$(FULL_CURRENT_PATH)&quot;</Command>
-        <Command name="Launch in IE" Ctrl="yes" Alt="yes" Shift="yes" Key="73">iexplore &quot;$(FULL_CURRENT_PATH)&quot;</Command>
-        <Command name="Launch in Chrome" Ctrl="yes" Alt="yes" Shift="yes" Key="82">chrome &quot;$(FULL_CURRENT_PATH)&quot;</Command>
-        <Command name="Launch in Safari" Ctrl="yes" Alt="yes" Shift="yes" Key="65">safari &quot;$(FULL_CURRENT_PATH)&quot;</Command>
-        <Command name="Send via Outlook" Ctrl="yes" Alt="yes" Shift="yes" Key="79">outlook /a &quot;$(FULL_CURRENT_PATH)&quot;</Command>
-		-->
         <Command name="Get PHP help" Ctrl="no" Alt="yes" Shift="no" Key="112">https://www.php.net/$(CURRENT_WORD)</Command>
         <Command name="Wikipedia Search" Ctrl="no" Alt="yes" Shift="no" Key="114">https://en.wikipedia.org/wiki/Special:Search?search=$(CURRENT_WORD)</Command>
         <Command name="Open file in another instance" Ctrl="no" Alt="yes" Shift="no" Key="117">$(NPP_FULL_FILE_PATH) $(CURRENT_WORD) -nosession -multiInst</Command>
diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml
index b8d29fc75..d8038619f 100644
--- a/PowerEditor/src/stylers.model.xml
+++ b/PowerEditor/src/stylers.model.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
     <LexerStyles>
         <LexerType name="actionscript" desc="ActionScript" ext="">
diff --git a/PowerEditor/src/toolbarIcons.xml b/PowerEditor/src/toolbarIcons.xml
index 1b3387ce1..d13f007d8 100644
--- a/PowerEditor/src/toolbarIcons.xml
+++ b/PowerEditor/src/toolbarIcons.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
     <ToolBarIcons>
 		<Theme name = "virgin" pathPrefix = "">
diff --git a/PowerEditor/src/userDefineLang.xml b/PowerEditor/src/userDefineLang.xml
index d9dbac648..271686c58 100644
--- a/PowerEditor/src/userDefineLang.xml
+++ b/PowerEditor/src/userDefineLang.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <NotepadPlus>
     <UserLang name="RC File" ext="rc">
         <Settings>