diff --git a/Dictionaries/mk_NoBreakAfterList.xml b/Dictionaries/mk_NoBreakAfterList.xml
index 74564e615..519436f4e 100644
--- a/Dictionaries/mk_NoBreakAfterList.xml
+++ b/Dictionaries/mk_NoBreakAfterList.xml
@@ -1,40 +1,40 @@
 <NoBreakAfterList>
-  <Item>г-дин</Item>
-  <Item>Г-дин</Item>
-  <Item>г-ѓа</Item>
-  <Item>Г-ѓа</Item>
-  <Item>Г-ѓо</Item>
-  <Item>г-ѓо</Item>
-  <Item>Г-ѓица</Item>
-  <Item>г-ѓица</Item>
-  <Item>Г-ѓице</Item>
-  <Item>г-ѓице</Item>
-  <Item>Г-ѓици</Item>
-  <Item>г-ѓици</Item>
-  <Item>Г-ѓи</Item>
-  <Item>г-ѓи</Item>
-  <Item>Г-дини</Item>
-  <Item>г-дини</Item>
-  <Item>Д-р</Item>
-  <Item>Проф.</Item>
-  <Item>д-р</Item>
-  <Item>проф.</Item>
-  <Item>т.н.</Item>
-  <Item>на пр.</Item>
-  <Item>год.</Item>
-  <Item>На пр.</Item>
-  <Item>Год.</Item>
-  <Item>ГОД.</Item>
-  <Item>м-р</Item>
-  <Item>М-р</Item>
   <Item>анг.</Item>
   <Item>англ.</Item>
-  <Item>пр.н.е</Item>
   <Item>г.ш.</Item>
-  <Item>н.в.</Item>
+  <Item>г-дин</Item>
+  <Item>Г-дин</Item>
+  <Item>г-дини</Item>
+  <Item>Г-дини</Item>
+  <Item>г-ѓа</Item>
+  <Item>Г-ѓа</Item>
+  <Item>г-ѓи</Item>
+  <Item>Г-ѓи</Item>
+  <Item>г-ѓица</Item>
+  <Item>Г-ѓица</Item>
+  <Item>г-ѓице</Item>
+  <Item>Г-ѓице</Item>
+  <Item>г-ѓици</Item>
+  <Item>Г-ѓици</Item>
+  <Item>г-ѓо</Item>
+  <Item>Г-ѓо</Item>
   <Item>г-ин</Item>
   <Item>Г-ин</Item>
   <Item>г-н</Item>
   <Item>Г-н</Item>
+  <Item>год.</Item>
+  <Item>Год.</Item>
+  <Item>ГОД.</Item>
+  <Item>д-р</Item>
+  <Item>Д-р</Item>
+  <Item>м-р</Item>
+  <Item>М-р</Item>
+  <Item>н.в.</Item>
+  <Item>на пр.</Item>
+  <Item>На пр.</Item>
+  <Item>пр.н.е</Item>
+  <Item>проф.</Item>
+  <Item>Проф.</Item>
+  <Item>т.н.</Item>
   <Item>чл.</Item>
 </NoBreakAfterList>
\ No newline at end of file
diff --git a/Dictionaries/mkd_OCRFixReplaceList.xml b/Dictionaries/mkd_OCRFixReplaceList.xml
index 207c5fcb0..5cf84a493 100644
--- a/Dictionaries/mkd_OCRFixReplaceList.xml
+++ b/Dictionaries/mkd_OCRFixReplaceList.xml
@@ -1,4 +1,5 @@
-<ReplaceList>
+<?xml version="1.0" encoding="utf-8"?>
+<OCRFixReplaceList>
   <WholeWords>
     <Word from="5ВЕЗДЕНИ" to="ЅВЕЗДЕНИ" />
     <Word from="5везден" to="ѕвезден" />
@@ -40,14 +41,15 @@
     <Word from="не не" to="не нѐ" />
     <Word from="и и" to="и ѝ" />
   </WholeWords>
+  <PartialWordsAlways />
+  <PartialWords>
+    <!-- Will be used to check words not in dictionary -->
+    <!-- If new word(s) exists in spelling dictionary, it is (they are) accepted -->
+  </PartialWords>
+  <WholeLines />
+  <PartialLinesAlways />
   <PartialLines />
   <BeginLines />
   <EndLines />
-  <WholeLines>
-  </WholeLines>
-  <RemovedWholeWords />
-  <RemovedPartialLines />
-  <RemovedBeginLines />
-  <RemovedEndLines />
-  <RemovedWholeLines />
-</ReplaceList>
\ No newline at end of file
+  <RegularExpressions />
+</OCRFixReplaceList>
\ No newline at end of file