diff --git a/README.md b/README.md
index 9dd42a5..e9201ff 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Personal website created with Astro.
 - [x] Table of contents
 - [x] Content management via [Directus](https://directus.io/)
 - [x] Form handling
-- [x] Comment system via [Disqus](https://disqus.com/)
+- [x] Comment system via [Remark42](https://github.com/umputun/remark42)
 - [x] RSS Feed for articles
 - [x] SEO optimized
 - [x] Views counter
diff --git a/package.json b/package.json
index c805d47..a8bc8f4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "yarkov.tech",
 	"private": false,
-	"version": "2.1.0",
+	"version": "2.2.0",
 	"description": "Personal website created with Astro.",
 	"author": {
 		"name": "Sergey Yarkov",
diff --git a/src/components/ArticleComments.astro b/src/components/ArticleComments.astro
index cb3a4e2..f6e73fe 100644
--- a/src/components/ArticleComments.astro
+++ b/src/components/ArticleComments.astro
@@ -1,44 +1,53 @@
 ---
+import UIString from "./UIString.astro";
+
 interface Props {
 	url: string;
 	id: string;
+	lang: LanguageKeys;
 }
 
-const { url, id } = Astro.props as Props;
+const { url, id, lang } = Astro.props as Props;
 ---
 
 <footer itemscope itemtype="http://schema.org/UserComments">
-	<div id="disqus_thread"></div>
+	<h2><UIString key={"articlePost.comments"} />:</h2>
+	<div id="remark42"></div>
 </footer>
 
-<script is:inline define:vars={{ url, id }}>
-	var disqus_config = function () {
-		this.page.url = url;
-		this.page.identifier = id;
+<script is:inline define:vars={{ url, id, lang }}>
+	window.remark_config = {
+		host: "https://remark.yarkov.tech",
+		site_id: "remark",
+		theme: window.theme,
+		show_email_subscription: true,
+		url,
+		locale: lang,
+		no_footer: true,
 	};
 
-	var e = document.getElementById("disqus_thread");
+	var e = document.getElementById("remark42");
 	if ("IntersectionObserver" in window) {
 		var t = new IntersectionObserver((e) => {
 			e.forEach((e) => {
-				e.isIntersecting &&
-					((function () {
-						var e = document,
-							t = e.createElement("script");
-						((t.src = "https://yarkov-tech.disqus.com/embed.js"),
-							t.setAttribute("data-timestamp", +new Date()),
-							(e.head || e.body).appendChild(t));
-					})(),
-					t.unobserve(e.target));
+				if (e.isIntersecting) {
+					((e, n) => {
+						for (var o = 0; o < e.length; o++) {
+							var r = n.createElement("script"),
+								c = ".js",
+								d = n.head || n.body;
+							("noModule" in r ? ((r.type = "module"), (c = ".mjs")) : (r.async = !0),
+								(r.defer = !0),
+								(r.src = remark_config.host + "/web/" + e[o] + c),
+								d.appendChild(r));
+						}
+					})(remark_config.components || ["embed"], document);
+					t.unobserve(e.target);
+				}
 			});
 		});
 		t.observe(e);
 	}
 
-	window.addEventListener(
-		"onthemetoggled",
-		() =>
-			document.readyState == "complete" &&
-			setTimeout(() => "DISQUS" in window && DISQUS.reset({ reload: true, config: disqus_config }), 100)
-	);
+	window.addEventListener("onthemetoggled", (e) => window.REMARK42.changeTheme(e.detail));
 </script>
diff --git a/src/components/ArticlePost.astro b/src/components/ArticlePost.astro
index 74fde3e..fc5abc9 100644
--- a/src/components/ArticlePost.astro
+++ b/src/components/ArticlePost.astro
@@ -28,7 +28,9 @@ const {
 	views,
 	article_id: articleTranslations,
 } = article;
+
 const t = useTranslation(Astro);
+// const articleCodeLangs = articleTranslations?.translations?.map((t) => t?.languages_code?.code);
 ---
 
 <article itemscope itemtype="http://schema.org/BlogPosting" class="article">
@@ -63,11 +65,7 @@ const t = useTranslation(Astro);
 			</time>
 			<span itemprop="author">{`${author?.first_name} ${author?.last_name}`}</span>
 		</div>
-		{
-			cover_image && (
-				<ArticleCover src={`${DIRECTUS_URL}/assets/${cover_image.filename_disk}`} alt={title} />
-			)
-		}
+		{cover_image && <ArticleCover src={`${DIRECTUS_URL}/assets/${cover_image.filename_disk}`} alt={title} />}
 		<div class="description">
 			<p>
 				{description}
@@ -76,9 +74,13 @@ const t = useTranslation(Astro);
 		<AvailableOnLangs articles={articleTranslations} />
 	</header>
 	<slot />
-	<ArticleComments url={canonicalUrl.href} id={slug} />
+	<ArticleComments lang={pageLang} url={canonicalUrl.href} id={slug} />
 </article>
 
+<!-- <script define:vars={{ articleCodeLangs }} is:inline>
+	console.log(navigator.language, articleCodeLangs);
+</script> -->
+
 <style lang="scss" is:global>
 	.article {
 		& header {
diff --git a/src/styles/global.scss b/src/styles/global.scss
index a22dee1..d124897 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -151,6 +151,6 @@ button {
 		border: 1px solid var(--border-color-hover);
 	}
 }
-#disqus_thread svg {
+#remark42 svg {
 	filter: none;
 }
diff --git a/src/styles/theme.scss b/src/styles/theme.scss
index 7271915..d6783d1 100644
--- a/src/styles/theme.scss
+++ b/src/styles/theme.scss
@@ -140,11 +140,4 @@
 	--icon-filter: invert(100%);
 
 	--image-filter: grayscale(50%);
-
-	/*
-		https://sergeyski.com/css-color-scheme-and-iframes-lessons-learned-from-disqus-background-bug/
-	*/
-	iframe[src*="disqus.com"] {
-		color-scheme: light;
-	}
 }
diff --git a/src/types/main.d.ts b/src/types/main.d.ts
index e2bcad5..9e296b6 100644
--- a/src/types/main.d.ts
+++ b/src/types/main.d.ts
@@ -10,6 +10,8 @@ declare global {
 			type: K,
 			listener: (this: Window, ev: CustomEventMap[K]) => void
 		): void;
+		REMARK42: any;
+		remark_config: any;
 	}
 
 	interface CustomEventMap {