diff --git a/PowerEditor/installer/configModel.xml b/PowerEditor/installer/configModel.xml
deleted file mode 100644
index bcef6f659..000000000
--- a/PowerEditor/installer/configModel.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
-<Node nodeName="NotepadPlus">
-    <Node nodeName="GUIConfigs" name="">
-        <Node nodeName="GUIConfig" name="name"/>
-    </Node>
-</Node>
diff --git a/PowerEditor/installer/langsModel.xml b/PowerEditor/installer/langsModel.xml
deleted file mode 100644
index ba690cfaf..000000000
--- a/PowerEditor/installer/langsModel.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
-<Node nodeName="NotepadPlus">
-    <Node nodeName="Languages" name="">
-        <Node nodeName="Language" name="name"/>
-    </Node>
-</Node>
diff --git a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
index d461e632b..e17fc638f 100644
--- a/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
+++ b/PowerEditor/installer/nsisInclude/mainSectionFuncs.nsh
@@ -52,18 +52,6 @@ Function setPathAndOptions
 FunctionEnd
 	
 Function copyCommonFiles
-	SetOverwrite on
-	SetOutPath "$TEMP\"
-	File "langsModel.xml"
-	File "configModel.xml"
-	File "stylesGlobalModel.xml"
-	File "stylesLexerModel.xml"
-	File "stylers_remove.xml"
-
-	File "..\bin\langs.model.xml"
-	File "..\bin\config.model.xml"
-	File "..\bin\stylers.model.xml"
-
 	SetOverwrite off
 	SetOutPath "$UPDATE_PATH\"
 	File "..\bin\contextMenu.xml"
@@ -72,7 +60,6 @@ Function copyCommonFiles
 	SetOverwrite on
 	SetOutPath "$INSTDIR\"
 	File "..\bin\langs.model.xml"
-	File "..\bin\config.model.xml"
 	File "..\bin\stylers.model.xml"
 	File "..\bin\contextMenu.xml"
 	File "..\bin\functionList.xml"
diff --git a/PowerEditor/installer/nsisInclude/uninstall.nsh b/PowerEditor/installer/nsisInclude/uninstall.nsh
index 2adc7a6b0..314e8b049 100644
--- a/PowerEditor/installer/nsisInclude/uninstall.nsh
+++ b/PowerEditor/installer/nsisInclude/uninstall.nsh
@@ -119,7 +119,7 @@ SectionEnd
 Var keepUserData
 Function un.doYouReallyWantToKeepData
 	StrCpy $keepUserData "false"
-	MessageBox MB_YESNO "Would you like to keep your custom settings?" IDYES skipRemoveUserData IDNO removeUserData
+	MessageBox MB_YESNO "Would you like to keep your custom settings?" /SD IDNO IDYES skipRemoveUserData IDNO removeUserData
 skipRemoveUserData:
 	StrCpy $keepUserData "true"
 removeUserData:
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index f2bff18fe..01d5e6d03 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -73,8 +73,6 @@ copy /Y ..\bin\readme.txt .\minimalist\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\change.log .\minimalist\
 If ErrorLevel 1 goto End
-copy /Y ..\src\config.model.xml .\minimalist\
-If ErrorLevel 1 goto End
 copy /Y ..\src\langs.model.xml .\minimalist\
 If ErrorLevel 1 goto End
 copy /Y ..\src\stylers.model.xml .\minimalist\
@@ -99,8 +97,6 @@ copy /Y ..\bin\readme.txt .\minimalist64\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\change.log .\minimalist64\
 If ErrorLevel 1 goto End
-copy /Y ..\src\config.model.xml .\minimalist64\
-If ErrorLevel 1 goto End
 copy /Y ..\src\langs.model.xml .\minimalist64\
 If ErrorLevel 1 goto End
 copy /Y ..\src\stylers.model.xml .\minimalist64\
@@ -146,8 +142,6 @@ copy /Y ..\bin\readme.txt .\zipped.package.release\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\change.log .\zipped.package.release\
 If ErrorLevel 1 goto End
-copy /Y ..\src\config.model.xml .\zipped.package.release\
-If ErrorLevel 1 goto End
 copy /Y ..\src\langs.model.xml .\zipped.package.release\
 If ErrorLevel 1 goto End
 copy /Y ..\src\stylers.model.xml .\zipped.package.release\
@@ -240,8 +234,6 @@ copy /Y ..\bin\readme.txt .\zipped.package.release64\
 If ErrorLevel 1 goto End
 copy /Y ..\bin\change.log .\zipped.package.release64\
 If ErrorLevel 1 goto End
-copy /Y ..\src\config.model.xml .\zipped.package.release64\
-If ErrorLevel 1 goto End
 copy /Y ..\src\langs.model.xml .\zipped.package.release64\
 If ErrorLevel 1 goto End
 copy /Y ..\src\stylers.model.xml .\zipped.package.release64\
diff --git a/PowerEditor/installer/stylers_remove.xml b/PowerEditor/installer/stylers_remove.xml
deleted file mode 100644
index 041502caf..000000000
--- a/PowerEditor/installer/stylers_remove.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
-<NotepadPlus>
-    <LexerStyles>
-        <LexerType name="searchResult" desc="Search result" ext="">
-            <WordsStyle name="DEFAULT" action="remove" />
-            <WordsStyle name="HEARDER" action="remove" />
-            <WordsStyle name="NUMBER" action="remove" />
-            <WordsStyle name="HIT WORD" action="remove" />
-            <WordsStyle name="KEYWORD1" action="remove" />
-            <WordsStyle name="KEYWORD2" action="remove" />
-            <WordsStyle name="SEARCH HEADER" action="remove" />
-            <WordsStyle name="FILE HEADER" action="remove" />
-            <WordsStyle name="LINE NUMBER" action="remove" />
-            <WordsStyle name="SELECTED LINE" action="remove" />
-        </LexerType>
-    </LexerStyles>
-</NotepadPlus>
diff --git a/PowerEditor/installer/stylesGlobalModel.xml b/PowerEditor/installer/stylesGlobalModel.xml
deleted file mode 100644
index 670544067..000000000
--- a/PowerEditor/installer/stylesGlobalModel.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
-<Node nodeName="NotepadPlus">
-    <Node nodeName="GlobalStyles">
-        <Node nodeName="WidgetStyle" name="name" />
-    </Node>
-</Node>
-
diff --git a/PowerEditor/installer/stylesLexerModel.xml b/PowerEditor/installer/stylesLexerModel.xml
deleted file mode 100644
index 4484be1e9..000000000
--- a/PowerEditor/installer/stylesLexerModel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
-<Node nodeName="NotepadPlus">
-    <Node nodeName="LexerStyles">
-        <Node nodeName="LexerType" name="name">
-			<Node nodeName="WordsStyle" name="name"/>
-		</Node>
-    </Node>
-</Node>
-