diff --git a/tools/syntax/nano/icinga2.nanorc b/tools/syntax/nano/icinga2.nanorc
index c36710e75..0cd8e55d2 100644
--- a/tools/syntax/nano/icinga2.nanorc
+++ b/tools/syntax/nano/icinga2.nanorc
@@ -19,9 +19,9 @@ icolor brightgreen 		"apply[ \t]+(Service|Dependency|Notification|ScheduledDownt
 
 ## objects attributes
 
-icolor red 		"(^|^\s+)(accept_config|action_url|address|address6|arguments|author|bind_host)"
+icolor red 		"(^|^\s+)(accept_commands|accept_config|action_url|address|address6|arguments|author|bind_host)"
 icolor red 		"(^|^\s+)(bind_port|ca_path|categories|cert_path|check_command|check_interval)"
-icolor red 		"(^|^\s+)(check_period|child_host_name|child_service_name|cleanup|command|command_path)"
+icolor red 		"(^|^\s+)(check_period|child_host_name|child_service_name|cleanup|command|command_endpoint|command_path)"
 icolor red 		"(^|^\s+)(comment|compat_log_path|crl_path|database|disable_checks|disable_notifications)"
 icolor red 		"(^|^\s+)(display_name|duration|email|enable_active_checks|enable_event_handler)"
 icolor red 		"(^|^\s+)(enable_flapping|enable_ha|enable_notifications|enable_passive_checks|enable_perfdata)"
@@ -33,7 +33,7 @@ icolor red 		"(^|^\s+)(pager|parent|parent_host_name|parent_service_name|passwor
 icolor red 		"(^|^\s+)(port|ranges|retry_interval|rotation_interval|rotation_method)"
 icolor red 		"(^|^\s+)(service_format_template|service_name|service_name_template|service_perfdata_path|service_temp_path)"
 icolor red 		"(^|^\s+)(severity|socket_path|socket_type|spool_dir|states|status_path|table_prefix)"
-icolor red 		"(^|^\s+)(timeout|times|types|update_interval|user|user_groups|users|volatile)"
+icolor red 		"(^|^\s+)(timeout|times|types|update_interval|user|user_groups|users|volatile|zone)"
 icolor red 		"(^|^\s+)(vars\.\w+)"
 
 
@@ -53,7 +53,7 @@ icolor white 	"(regex|match|len|union|intersection|string|number|bool|log|exit)"
 ## global constats
 icolor yellow  	"(PrefixDir|SysconfDir|ZonesDir|LocalStateDir|PkgDataDir|RunDir|StatePath|PidPath)"
 icolor yellow  	"(NodeName|ApplicationType|EnableNotifications|EnableEventHandlers)"
-icolor yellow  	"(EnableFlapping|EnableHostChecks|EnableServiceChecks|EnablePerfdata|UseVfork)"
+icolor yellow  	"(EnableFlapping|EnableHostChecks|EnableServiceChecks|EnablePerfdata|UseVfork|RunAsUser|RunAsGroup)"
 icolor yellow  	"(Vars\s+)"
 
 
diff --git a/tools/syntax/vim/syntax/icinga2.vim b/tools/syntax/vim/syntax/icinga2.vim
index 3ea37488a..72a835365 100644
--- a/tools/syntax/vim/syntax/icinga2.vim
+++ b/tools/syntax/vim/syntax/icinga2.vim
@@ -62,9 +62,9 @@ syn match		icinga2ApplyDef		"apply[ \t]\+\(Service\|Dependency\|Notification\|Sc
 
 " objects attributes
 
-syn keyword		icinga2ObjAttr		contained	accept_config action_url address address6 arguments author bind_host
+syn keyword		icinga2ObjAttr		contained	accept_commands accept_config action_url address address6 arguments author bind_host
 syn keyword		icinga2ObjAttr		contained	bind_port ca_path categories cert_path check_command check_interval
-syn keyword		icinga2ObjAttr		contained	check_period child_host_name child_service_name cleanup command command_path
+syn keyword		icinga2ObjAttr		contained	check_period child_host_name child_service_name cleanup command command_endpoint command_path
 syn keyword		icinga2ObjAttr		contained	comment compat_log_path crl_path database disable_checks disable_notifications
 syn keyword		icinga2ObjAttr		contained	display_name duration email enable_active_checks enable_event_handler
 syn keyword		icinga2ObjAttr		contained	enable_flapping enable_ha enable_notifications enable_passive_checks enable_perfdata
@@ -76,7 +76,7 @@ syn keyword		icinga2ObjAttr		contained	pager parent parent_host_name parent_serv
 syn keyword		icinga2ObjAttr		contained	port ranges retry_interval rotation_interval rotation_method
 syn keyword		icinga2ObjAttr		contained	service_format_template service_name service_name_template service_perfdata_path service_temp_path
 syn keyword		icinga2ObjAttr		contained	severity socket_path socket_type spool_dir states status_path table_prefix
-syn keyword		icinga2ObjAttr		contained	timeout times types update_interval user user_groups users volatile
+syn keyword		icinga2ObjAttr		contained	timeout times types update_interval user user_groups users volatile zone
 syn match		icinga2ObjAttr		contained	"\(vars.\w\+\)"
 
 
@@ -98,7 +98,7 @@ syn keyword		icinga2Function		contained	regex match len union intersection strin
 " global constats
 syn keyword		icinga2Gconst		PrefixDir SysconfDir ZonesDir LocalStateDir PkgDataDir RunDir StatePath PidPath
 syn keyword		icinga2Gconst		NodeName ApplicationType EnableNotifications EnableEventHandlers 
-syn keyword		icinga2Gconst		EnableFlapping EnableHostChecks EnableServiceChecks EnablePerfdata UseVfork
+syn keyword		icinga2Gconst		EnableFlapping EnableHostChecks EnableServiceChecks EnablePerfdata RunAsUser RunAsGroup UseVfork
 syn	match		icinga2Gconst		"\(Vars[ \t]\+\)"
 
 " values type