diff --git a/profiles/templates/1_ac_install_disk/2-system/00-calculate-install/calculate.env b/profiles/templates/1_ac_install_disk/2-system/00-calculate-install/calculate.env
index 795daee17..dfc8abd12 100644
--- a/profiles/templates/1_ac_install_disk/2-system/00-calculate-install/calculate.env
+++ b/profiles/templates/1_ac_install_disk/2-system/00-calculate-install/calculate.env
@@ -1,4 +1,4 @@
-# Calculate format=samba name=calculate.env comment=#  mergepkg(sys-apps/calculate-utils)!=
+# Calculate format=samba name=calculate.env mergepkg(sys-apps/calculate-utils)!=
 
 [install]
 #?os_root_type==hdd&&cl_autopartition_set==off#
diff --git a/profiles/templates/2_ac_install_merge/net-fs/samba/smb.conf b/profiles/templates/2_ac_install_merge/net-fs/samba/smb.conf
index 540107770..2d4c57cc4 100644
--- a/profiles/templates/2_ac_install_merge/net-fs/samba/smb.conf
+++ b/profiles/templates/2_ac_install_merge/net-fs/samba/smb.conf
@@ -1 +1 @@
-# Calculate protected format=raw exists(/etc/samba/smb.conf)==
+# Calculate exists(/etc/samba/smb.conf)== protected
diff --git a/profiles/templates/2_ac_install_merge/sys-apps/openrc/conf.d/netmount b/profiles/templates/2_ac_install_merge/sys-apps/openrc/conf.d/netmount
index bb91a0820..fc3c6759d 100644
--- a/profiles/templates/2_ac_install_merge/sys-apps/openrc/conf.d/netmount
+++ b/profiles/templates/2_ac_install_merge/sys-apps/openrc/conf.d/netmount
@@ -1,4 +1,4 @@
-# Calculate comment=# format=openrc ini(container.type)==desktop
+# Calculate format=openrc ini(container.type)==desktop
 
 rc_need="net"
 rc_keyword="!-lxc"
diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink b/profiles/templates/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
index 56f2a3ce9..d08a952e1 100644
--- a/profiles/templates/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
+++ b/profiles/templates/3_ac_install_live/1-merge/sys-devel/prelink/conf.d/prelink
@@ -1,2 +1,2 @@
-# Calculate comment=# format=openrc os_install_root_type!=livecd
+# Calculate format=openrc os_install_root_type!=livecd
 PRELINKING=""
diff --git a/profiles/templates/3_ac_install_live/1-merge/sys-power/acpid/conf.d/acpid b/profiles/templates/3_ac_install_live/1-merge/sys-power/acpid/conf.d/acpid
index 60e68d479..d52d59a3f 100644
--- a/profiles/templates/3_ac_install_live/1-merge/sys-power/acpid/conf.d/acpid
+++ b/profiles/templates/3_ac_install_live/1-merge/sys-power/acpid/conf.d/acpid
@@ -1,4 +1,4 @@
-# Calculate comment=# format=openrc
+# Calculate format=openrc
 
 # Available values: suspend/hibernate/suspend-hybrid/shutdown
 LID_CLOSE_ACTION="suspend"
diff --git a/profiles/templates/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env b/profiles/templates/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
index d8ae7965e..3aeac3f80 100644
--- a/profiles/templates/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
+++ b/profiles/templates/6_ac_builder_setup/sys-apps/calculate-utils/calculate.env
@@ -1,4 +1,4 @@
-# Calculate path=/var/lib/calculate comment=# format=samba
+# Calculate path=/var/lib/calculate format=samba
 [main]
 cl_autoupdate_set = on
 cl_template_locate = #-cl_builder_template_location-#
diff --git a/profiles/templates/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env b/profiles/templates/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
index d3e857fc3..f1a19dc94 100644
--- a/profiles/templates/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
+++ b/profiles/templates/6_ac_builder_squash/1_setup/sys-apps/calculate-utils/calculate.env
@@ -1,4 +1,4 @@
-# Calculate comment=# format=samba path=/var/lib/calculate
+# Calculate format=samba path=/var/lib/calculate
 [main]
 os_linux_build = #-os_builder_linux_build-#
 os_linux_files = #-os_builder_linux_files-#
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc b/profiles/templates/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
index f7c19fc6c..f5dc32e89 100644
--- a/profiles/templates/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
+++ b/profiles/templates/6_ac_desktop_profile/2-user/x11-terms/xfce4-terminal-0.6.0/terminalrc
@@ -1,4 +1,4 @@
-# Calculate path=~/.config/xfce4/terminal format=raw comment=#
+# Calculate path=~/.config/xfce4/terminal comment=#
 [Configuration]
 ColorBackground=#2c2c2c2c2c2c
 ColorBold=#dcdcdcdccccc