diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
index f218b83e..f06e6440 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
@@ -669,8 +669,8 @@ protected:
 	bool _lineNumbersShown;
 	bool _wrapRestoreNeeded;
 
-	typedef std::map<int, Style> StyleMap;
-	typedef std::map<BufferID, StyleMap*> BufferStyleMap;
+	typedef std::unordered_map<int, Style> StyleMap;
+	typedef std::unordered_map<BufferID, StyleMap*> BufferStyleMap;
 	BufferStyleMap _hotspotStyles;
 
 	int _beginSelectPosition;
diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp b/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
index 9c34dda7..1c441633 100644
--- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
+++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
@@ -1641,7 +1641,7 @@ INT_PTR CALLBACK StylerDlg::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LPAR
             dlg->_pFgColour->display();
             dlg->_pBgColour->display();
 
-            map<int, int>::iterator iter = globalMappper().nestingMapper.begin();
+            unordered_map<int, int>::iterator iter = globalMappper().nestingMapper.begin();
             for (; iter != globalMappper().nestingMapper.end(); ++iter)
             {
                 ::SendDlgItemMessage(hwnd, iter->first, BM_SETCHECK, style._nesting & iter->second, 0);
@@ -1730,7 +1730,7 @@ INT_PTR CALLBACK StylerDlg::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LPAR
                     style._fontStyle |= FONTSTYLE_UNDERLINE;
 
                 style._nesting = SCE_USER_MASK_NESTING_NONE;
-                map<int, int>::iterator iter = globalMappper().nestingMapper.begin();
+                unordered_map<int, int>::iterator iter = globalMappper().nestingMapper.begin();
                 for (; iter != globalMappper().nestingMapper.end(); ++iter)
                 {
                     if (BST_CHECKED == ::SendMessage(::GetDlgItem(hwnd, iter->first), BM_GETCHECK, 0, 0))
diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.h b/PowerEditor/src/ScitillaComponent/UserDefineDialog.h
index 26bd6302..2ae1fa2d 100644
--- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.h
+++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.h
@@ -51,7 +51,7 @@ static int max(int a, int b) {
 #endif //__GNUC__
 #include "tchar.h"
 #include "scilexer.h"
-#include <map>
+#include <unordered_map>
 
 class ScintillaEditView;
 class UserLangContainer;
@@ -66,18 +66,18 @@ class GlobalMappers
 {
     public:
 
-		std::map<generic_string, int> keywordIdMapper;
-		std::map<int, generic_string> keywordNameMapper;
+		std::unordered_map<generic_string, int> keywordIdMapper;
+		std::unordered_map<int, generic_string> keywordNameMapper;
 
-		std::map<generic_string, int> styleIdMapper;
-		std::map<int, generic_string> styleNameMapper;
+		std::unordered_map<generic_string, int> styleIdMapper;
+		std::unordered_map<int, generic_string> styleNameMapper;
 
-		std::map<generic_string, int> temp;
-		std::map<generic_string, int>::iterator iter;
+		std::unordered_map<generic_string, int> temp;
+		std::unordered_map<generic_string, int>::iterator iter;
 
-		std::map<int, int> nestingMapper;
-		std::map<int, int> dialogMapper;
-		std::map<int, std::string> setLexerMapper;
+		std::unordered_map<int, int> nestingMapper;
+		std::unordered_map<int, int> dialogMapper;
+		std::unordered_map<int, std::string> setLexerMapper;
 
         // only default constructor is needed
         GlobalMappers()