diff --git a/app/build.gradle b/app/build.gradle
index d38c3c74..3ced0cf5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,11 +20,11 @@ android {
 
     def fileNaming = "apk/ForPDA"
 
-    def versionNumber = 221
+    def versionNumber = 223
 
-    def versionMajor = "0"
-    def versionMinor = "9"
-    def versionPatch = "8"
+    def versionMajor = "1"
+    def versionMinor = "0"
+    def versionPatch = "0"
 
     def versionBuild = -1
     def versionPropsFile = file('version.properties')
diff --git a/app/src/main/assets/patterns.json b/app/src/main/assets/patterns.json
index 7fb5f198..b8d27ea4 100644
--- a/app/src/main/assets/patterns.json
+++ b/app/src/main/assets/patterns.json
@@ -1,5 +1,5 @@
 {
-  "version": 18,
+  "version": 21,
   "scopes": [
     {
       "scope":"global",
@@ -109,7 +109,7 @@
         },
         {
           "key": "attachments",
-          "value": "(\\d+)\u0002([^\u0002]*?)\u0002([^\u0002]*?)\u0002(\\/\\/[^\u0002]*?)\u0002(\\d+)\u0002([0-9a-fA-F]+)(?:(?:\u0002(\\/\\/[^\u0002]*?)\u0002(\\d+)\u0002(\\d+))?(?:\u0003\u0004(\\d+)\u0003\u0004([^\u0002]*?)\u0003\u0004([^\u0002]*?)\u0003)?)?"
+          "value": "(\\d+)\u0002([^\u0002]*?)\u0002([^\u0002]*?)\u0002(?:https?:)?(\\/\\/[^\u0002]*?)\u0002(\\d+)\u0002([0-9a-fA-F]+)(?:(?:\u0002(?:https?:)?(\\/\\/[^\u0002]*?)\u0002(\\d+)\u0002(\\d+))?(?:\u0003\u0004(\\d+)\u0003\u0004([^\u0002]*?)\u0003\u0004([^\u0002]*?)\u0003)?)?"
         }
       ]
     },
@@ -169,11 +169,11 @@
         },
         {
           "key": "detail",
-          "value": "<[^>]*>[^<]*?<[^>]*?>[^<]*?<div[^>]*?data-ztm=\"\\d+:(\\d+)[^\"]*?\"[^>]*?>[^<]*?<meta[^>]*?content=\"([^\"]*?)\"[^>]*?>[\\s\\S]*?<div[^>]*?class=\"photo\"[^>]*?>[^<]*?<img[^>]*?src=\"([^\"]*?)\"[^>]*?>[\\s\\S]*?<div[^>]*?class=\"description\"[^>]*?>[^<]*?<h1[^>]*?>(?:<span[^>]*?>)?([^<]*?)(?:<\\/span>)?<\\/h1>[\\s\\S]*?<em[^>]*?class=\"date\"[^>]*?>([^<]*?)<\\/em>[^<]*?<span[^>]*?class=\"name\"[^>]*?>[^<]*?<a[^>]*?href=\"[^\"]*?(\\d+)\"[^>]*?>([^<]*?)<\\/a>[\\s\\S]*?<div[^>]*?class=\"more-box\"[^>]*?>[^<]*?<a[^>]*?>(\\d+)<\\/a>(?:<div class=\"meta\"># )?([\\s\\S]*?)<\\/div>?[\\s\\S]*?<div class=\"content-box\" itemprop=\"articleBody\"[^>]*?>([\\s\\S]*?)<\\/div>[^<]*?<\\/div>[^<]*?<\\/div>[^<]*?<script[^>]*?>[^<]*?<\\/script>(?:[^<]*?<div class=\"materials-box\"[^>]*?>(?:[\\s\\S]*?<ul class=\"materials-slider\"[^>]*?>([\\s\\S]*?)<\\/ul>)?[^<]*?<\\/div>)?[\\s\\S]*?[^<]*?<ul class=\"page-nav[^\"]*?\">[\\s\\S]*?<a href=\"[^\"]*?\\/(\\d+)\\/\"[\\s\\S]*?<\\/ul>(?:[\\s\\S]*?<div class=\"comment-box[^\"]*?\" id=\"comments\"[^>]*?>[^<]*?(?:<div class=\"[^\"]*?close[^\"]*?\"[^>]*?>[\\s\\S]*?<\\/div>[^<]*?<\\/div>[^<]*?<div class=\"[^\"]*?open[^\"]*?\"[^>]*?>)?[\\s\\S]*?<div class=\"heading\"[^>]*?>[^>]*?<h2>[^<]*?<\\/h2>([\\s\\S]*?)<\\/div>([\\s\\S]*?)[^<]*?<br[^>]*?>[^<]*?<\\/div>[^<]*?(?:<\\/div|<ul class=\"page-nav))?"
+          "value": "<[^>]*>[^<]*?<[^>]*?>[^<]*?<div[^>]*?data-ztm=\"\\d+:(\\d+)[^\"]*?\"[^>]*?>[^<]*?<meta[^>]*?content=\"([^\"]*?)\"[^>]*?>[\\s\\S]*?<div[^>]*?class=\"photo\"[^>]*?>[^<]*?<img[^>]*?src=\"([^\"]*?)\"[^>]*?>[\\s\\S]*?<div[^>]*?class=\"description\"[^>]*?>[^<]*?<h1[^>]*?>(?:<span[^>]*?>)?([^<]*?)(?:<\\/span>)?<\\/h1>[\\s\\S]*?<div class=\"meta\">([\\s\\S]*?)<\\/div>[\\s\\S]*?<em[^>]*?class=\"date\"[^>]*?>([^<]*?)<\\/em>[^<]*?<span[^>]*?class=\"name\"[^>]*?>[^<]*?<a[^>]*?href=\"[^\"]*?(\\d+)\"[^>]*?>([^<]*?)<\\/a>[^<]*?<\\/span>[^<]*?<span class=\"number\">[^<]*?<a[^>]*?>(\\d+)<\\/a>[^<]*?<\\/span>[\\s\\S]*?<div class=\"content-box\" itemprop=\"articleBody\"[^>]*?>([\\s\\S]*?)<\\/div>[^<]*?<\\/div>[^<]*?<\\/div>[^<]*?<script[^>]*?>[^<]*?<\\/script>(?:[^<]*?<div class=\"materials-box\"[^>]*?>(?:[\\s\\S]*?<ul class=\"materials-slider\"[^>]*?>([\\s\\S]*?)<\\/ul>)?[^<]*?<\\/div>)?[\\s\\S]*?[^<]*?<ul class=\"page-nav[^\"]*?\">[\\s\\S]*?<a href=\"[^\"]*?\\/(\\d+)\\/\"[\\s\\S]*?<\\/ul>(?:[\\s\\S]*?<div class=\"comment-box[^\"]*?\" id=\"comments\"[^>]*?>[\\s\\S]*?(<ul class=\"comment-list[\\s\\S]*?<\\/ul>)(?:<form|<\\/div><\\/div><article))"
         },
         {
           "key": "detail_v2",
-          "value": "<[^>]*>[^<]*?<[^>]*?>[^<]*?<div[^>]*?data-ztm=\"\\d+:(\\d+)[^\"]*?\"[^>]*?>[^<]*?<meta[^>]*?content=\"([^\"]*?)\"[^>]*?>[\\s\\S]*?<div class=\"[^\"]*?article[^\"]*?\"[^>]*?><div class=\"[^\"]*?article-header[^\"]*?\"[^>]*?>(?:<h1>)?([^<]*?)(?:<\\/h1>)[\\s\\S]*?<time[^>]*?>([^<]*?)<\\/time>[\\s\\S]*?<a[^>]*?href=\"#comments\"[^>]*?>(\\d+)<\\/a>[\\s\\S]*?(<meta property=\"og:description\"[\\s\\S]*?)<div class=\"article-footer[^\"]*?\"[^>]*?>[\\s\\S]*?(?:<div class=\"article-footer-tags[^\"]*?\"[^>]*?>([\\s\\S]*?)<\\/div>)?<\\/div>[^<]*?<\\/div>[^<]*?<\\/div>[^<]*?<script[^>]*?>[^<]*?<\\/script>(?:[^<]*?<div class=\"materials-box\"[^>]*?>(?:[\\s\\S]*?<ul class=\"materials-slider\"[^>]*?>([\\s\\S]*?)<\\/ul>)?[^<]*?<\\/div>)?[\\s\\S]*?[^<]*?<ul class=\"page-nav[^\"]*?\">[\\s\\S]*?<a href=\"[^\"]*?\\/(\\d+)\\/\"[\\s\\S]*?<\\/ul>(?:[\\s\\S]*?<div class=\"comment-box[^\"]*?\" id=\"comments\"[^>]*?>[^<]*?(?:<div class=\"[^\"]*?close[^\"]*?\"[^>]*?>[\\s\\S]*?<\\/div>[^<]*?<\\/div>[^<]*?<div class=\"[^\"]*?open[^\"]*?\"[^>]*?>)?[\\s\\S]*?<div class=\"heading\"[^>]*?>[^>]*?<h2>[^<]*?<\\/h2>([\\s\\S]*?)<\\/div>([\\s\\S]*?)[^<]*?<br[^>]*?>[^<]*?<\\/div>[^<]*?(?:<\\/div|<ul class=\"page-nav))?"
+          "value": "<[^>]*>[^<]*?<[^>]*?>[^<]*?<div[^>]*?data-ztm=\"\\d+:(\\d+)[^\"]*?\"[^>]*?>[^<]*?<meta[^>]*?content=\"([^\"]*?)\"[^>]*?>[\\s\\S]*?<div class=\"[^\"]*?article[^\"]*?\"[^>]*?><div class=\"[^\"]*?article-header[^\"]*?\"[^>]*?>(?:<h1>)?([^<]*?)(?:<\\/h1>)[\\s\\S]*?<time[^>]*?>([^<]*?)<\\/time>[\\s\\S]*?<a[^>]*?href=\"#comments\"[^>]*?>(\\d+)<\\/a>[\\s\\S]*?(<meta property=\"og:description\"[\\s\\S]*?)<div class=\"article-footer[^\"]*?\"[^>]*?>[\\s\\S]*?(?:<div class=\"article-footer-tags[^\"]*?\"[^>]*?>([\\s\\S]*?)<\\/div>)?<\\/div>[^<]*?<\\/div>[^<]*?<\\/div>[^<]*?<script[^>]*?>[^<]*?<\\/script>(?:[^<]*?<div class=\"materials-box\"[^>]*?>(?:[\\s\\S]*?<ul class=\"materials-slider\"[^>]*?>([\\s\\S]*?)<\\/ul>)?[^<]*?<\\/div>)?[\\s\\S]*?[^<]*?<ul class=\"page-nav[^\"]*?\">[\\s\\S]*?<a href=\"[^\"]*?\\/(\\d+)\\/\"[\\s\\S]*?<\\/ul>(?:[\\s\\S]*?<div class=\"comment-box[^\"]*?\" id=\"comments\"[^>]*?>[\\s\\S]*?(<ul class=\"comment-list[\\s\\S]*?<\\/ul>)(?:<form|<\\/div><\\/div><article))"
         },
         {
           "key": "detail_detector",
diff --git a/app/src/main/java/forpdateam/ru/forpda/model/data/remote/api/news/ArticleParser.kt b/app/src/main/java/forpdateam/ru/forpda/model/data/remote/api/news/ArticleParser.kt
index d9e8f334..79414ef8 100644
--- a/app/src/main/java/forpdateam/ru/forpda/model/data/remote/api/news/ArticleParser.kt
+++ b/app/src/main/java/forpdateam/ru/forpda/model/data/remote/api/news/ArticleParser.kt
@@ -70,13 +70,13 @@ class ArticleParser(
                     id = matcher.group(1).toInt()
                     imgUrl = matcher.group(3)
                     title = matcher.group(4).fromHtml()
-                    date = matcher.group(5)
-                    authorId = matcher.group(6).toInt()
-                    author = matcher.group(7).fromHtml()
-                    commentsCount = matcher.group(8).toInt()
-                    matcher.group(9)?.let {
+                    matcher.group(5)?.let {
                         tags.addAll(parseTags(it))
                     }
+                    date = matcher.group(6)
+                    authorId = matcher.group(7).toInt()
+                    author = matcher.group(8).fromHtml()
+                    commentsCount = matcher.group(9).toInt()
                     html = matcher.group(10)
                     matcher.group(11)?.also {
                         materials.addAll(parseMaterials(it))
@@ -85,7 +85,7 @@ class ArticleParser(
 
                     karmaMap = parseKarma(response)
 
-                    commentsSource = matcher.group(14)?.let { comments ->
+                    commentsSource = matcher.group(13)?.let { comments ->
                         patternProvider
                                 .getPattern(scope.scope, scope.exclude_form_comment)
                                 .matcher(comments)
@@ -136,7 +136,7 @@ class ArticleParser(
 
                     karmaMap = parseKarma(response)
 
-                    commentsSource = matcher.group(11)?.let { comments ->
+                    commentsSource = matcher.group(10)?.let { comments ->
                         patternProvider
                                 .getPattern(scope.scope, scope.exclude_form_comment)
                                 .matcher(comments)
@@ -239,10 +239,12 @@ class ArticleParser(
             comment.isDeleted = isDeleted
 
             if (!isDeleted) {
+                val avatarNode = Parser.findNode(commentNode, "a", "class", "comment-avatar")
                 val nickNode = Parser.findNode(commentNode, "a", "class", "nickname")
-                val metaNode = Parser.findNode(commentNode, "span", "class", "h-meta")
+                        ?: Parser.findNode(commentNode, "span", "class", "nickname")
+                val metaNode = Parser.findNode(commentNode, "a", "class", "date")
 
-                userId = nickNode!!.getAttribute("href")
+                userId = avatarNode!!.getAttribute("href")
                 if (userId != null) {
                     matcher = patternProvider
                             .getPattern(scope.scope, scope.comment_user_id)
@@ -256,8 +258,7 @@ class ArticleParser(
                 userNick = Parser.getHtml(nickNode, true)
                 comment.userNick = ApiUtils.fromHtml(userNick)
 
-                date = Parser.ownText(metaNode!!).trim()
-                date = date.replace(" |", ",")
+                date = metaNode?.let { Parser.ownText(metaNode).trim() }
                 comment.date = date
             }
 
diff --git a/app/version.properties b/app/version.properties
index 5984f3e8..23685afb 100644
--- a/app/version.properties
+++ b/app/version.properties
@@ -1,3 +1,3 @@
-#Fri Sep 25 21:17:23 MSK 2020
-DATE_BUILD=25 сентября 2020 г.
-VERSION_BUILD=13597
+#Tue Dec 15 19:06:44 YEKT 2020
+DATE_BUILD=15 December 2020 г.
+VERSION_BUILD=13624
diff --git a/gradle.properties b/gradle.properties
index d004eb5b..650a96b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,5 @@
 # android.enableAapt2=false
 android.enableD8.desugaring = true
 android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1536m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
\ No newline at end of file