diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop
index 5ae4a5356..8258d992d 100644
--- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop
+++ b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.14.desktop
@@ -9,4 +9,4 @@ Name=Calculate Linux Community
 Name[bg]=Calculate Linux Общност
 Name[ru]=Сообщество Calculate Linux
 Name[uk]=Cпівтовариство Calculate Linux
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat"
diff --git a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop b/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop
deleted file mode 100644
index 3029f8d59..000000000
--- a/profiles/templates/3.6/2_ac_install_merge/zzz-Desktop/120-Chat/20-hexchat/install/hexchat-2.9.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/hexchat.desktop name=calculate-chat.desktop mirror pkg(net-irc/hexchat)=>2.9,2.14
-
-# Hide icon
-[Desktop Entry]
-NoDisplay=true
-!MimeType=
-
-Name=Calculate Linux Community
-Name[bg]=Calculate Linux Общност
-Name[ru]=Сообщество Calculate Linux
-Name[uk]=Cпівтовариство Calculate Linux
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate"
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/net-irc/hexchat/io.github.Hexchat.desktop b/profiles/templates/3.6/3_ac_install_live/1-merge/net-irc/hexchat/io.github.Hexchat.desktop
index 8dd746954..e54f45f9d 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/net-irc/hexchat/io.github.Hexchat.desktop
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/net-irc/hexchat/io.github.Hexchat.desktop
@@ -2,17 +2,17 @@
 
 [Desktop Entry]
 #?in(os_locale_language,es,es_UY)!=#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-es"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-es"
 #in#
 #?in(os_locale_language,pt,pt_BR)!=#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-pt"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-pt"
 #in#
 #?os_locale_language==fr#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-fr"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-fr"
 #os_locale_language#
 #?os_locale_language==ru#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-ru"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-ru"
 #os_locale_language#
 #?in(os_locale_language,fr,ru,es,es_UY,pt,pt_BR)==#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat"
 #in#
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
index 368e1a4a6..57e2501c0 100644
--- a/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
+++ b/profiles/templates/3.6/6_ac_desktop_profile/1-user-init/empty_dir/0ini.env
@@ -4,7 +4,7 @@
 update = on
 
 [ver]
-patch = 53
+patch = 55
 
 [update]
 patch = on
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-55/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-55/.calculate_directory
new file mode 100644
index 000000000..dbe00a756
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-55/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<55
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-55/hexchat-2.14.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-55/hexchat-2.14.desktop
new file mode 100644
index 000000000..c2fc2afdb
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-55/hexchat-2.14.desktop
@@ -0,0 +1,18 @@
+# Calculate format=kde name=io.github.Hexchat.desktop path=~/.local/share/applications link=/usr/share/applications/io.github.Hexchat.desktop mirror pkg(net-irc/hexchat)>=2.14
+
+[Desktop Entry]
+#?in(os_locale_language,es,es_UY)!=#
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-es"
+#in#
+#?in(os_locale_language,pt,pt_BR)!=#
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-pt"
+#in#
+#?os_locale_language==fr#
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-fr"
+#os_locale_language#
+#?os_locale_language==ru#
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-ru"
+#os_locale_language#
+#?in(os_locale_language,fr,ru,es,es_UY,pt,pt_BR)==#
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat"
+#in#
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-55/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-55/ini.env
new file mode 100644
index 000000000..b143ef512
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/0_Patch/patch-55/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba path=~/.calculate
+
+[ver]
+patch = 55
+
+[update]
+patch = on
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop
index f41184469..1111f0d91 100644
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.14.desktop
@@ -2,17 +2,17 @@
 
 [Desktop Entry]
 #?in(os_locale_language,es,es_UY)!=#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-es"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-es"
 #in#
 #?in(os_locale_language,pt,pt_BR)!=#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-pt"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-pt"
 #in#
 #?os_locale_language==fr#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-fr"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-fr"
 #os_locale_language#
 #?os_locale_language==ru#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-ru"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat-ru"
 #os_locale_language#
 #?in(os_locale_language,fr,ru,es,es_UY,pt,pt_BR)==#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate"
+Exec=hexchat "--url=ircs://irc.calculate.social:6697/#chat"
 #in#
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop b/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop
deleted file mode 100644
index 2945ca19b..000000000
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/net-irc/hexchat-2.9/applications/hexchat-2.9.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-# Calculate format=kde name=hexchat.desktop link=/usr/share/applications/hexchat.desktop mirror pkg(net-irc/hexchat)=>2.9,2.14
-
-[Desktop Entry]
-#?in(os_locale_language,es,es_UY)!=#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-es"
-#in#
-#?in(os_locale_language,pt,pt_BR)!=#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-pt"
-#in#
-#?os_locale_language==fr#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-fr"
-#os_locale_language#
-#?os_locale_language==ru#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-ru"
-#os_locale_language#
-#?in(os_locale_language,fr,ru,es,es_UY,pt,pt_BR)==#
-Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate"
-#in#
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
index 36fa39be8..4dc9432cc 100644
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20210615.2
+remerge = 20210625
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210625 b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210625
new file mode 100644
index 000000000..1731eb971
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210625
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=net-irc/hexchat
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#