Index: vim/syntax/objc.vim
==================================================================
--- vim/syntax/objc.vim
+++ vim/syntax/objc.vim
@@ -28,19 +28,19 @@
 " and uses *.h, *.m as file extensions!
 
 
 " ObjC keywords, types, type qualifiers etc.
 syn keyword objcStatement	self super _cmd
-syn keyword objcType		id Class SEL IMP BOOL
+syn keyword objcType		id Class SEL IMP BOOL objc_property_t Ivar
 syn keyword objcType		nonnull nullable null_unspecified
 syn keyword objcTypeModifier	bycopy in out inout oneway OF_GENERIC OF_INLINE
 syn keyword objcTypeModifier	OF_KINDOF OF_CONST_FUNC OF_NO_RETURN
 syn keyword objcTypeModifier	OF_RETURNS_INNER_POINTER OF_NULLABLE_PROPERTY
 syn keyword objcTypeModifier	OF_NULL_RESETTABLE_PROPERTY OF_UNAVAILABLE
 syn keyword objcTypeModifier	OF_DESIGNATED_INITIALIZER OF_METHOD_FAMILY
 syn keyword objcTypeModifier	OF_REQUIRES_SUPER OF_ALIGNOF OF_ALIGNAS
-syn keyword objcTypeModifier	OF_SENTINEL
+syn keyword objcTypeModifier	OF_SENTINEL OF_SUBCLASSING_RESTRICTED
 syn keyword objcTypeModifier	_Nonnull _Nullable _Null_unspecified __kindof
 syn keyword objcConstant	nil Nil OF_NOT_FOUND
 
 " Match the ObjC #import directive (like C's #include)
 syn region objcImported display contained start=+"+  skip=+\\\\\|\\"+  end=+"+
@@ -130,11 +130,11 @@
 syn keyword objcType of_unichar_t of_char16_t of_char32_t of_comparison_result_t
 syn keyword objcType of_comparator_t of_byte_order_t of_range_t of_point_t
 syn keyword objcType of_dimension_t of_mutex_t of_rmutex_t of_rectangle_t
 syn keyword objcType of_string_encoding_t of_time_interval_t
 syn keyword objcType of_resolver_result_t of_udp_socket_address_t of_offset_t
-syn keyword objcType of_stat_t of_socket_t of_spinlock_t
+syn keyword objcType of_socket_t of_spinlock_t
 syn keyword objcType of_options_parser_option_t of_http_request_method_t
 syn keyword objcType of_http_request_protocol_version_t of_socket_address_t
 syn keyword objcType of_file_attribute_key_t of_file_type_t of_file_attributes_t
 syn keyword objcConstant YES NO TRUE FALSE
 

Index: vimrc
==================================================================
--- vimrc
+++ vimrc
@@ -26,5 +26,6 @@
 au BufNewFile,BufRead *.vhd :se ts=4 sw=4
 au BufNewFile,BufRead *.py :se ts=4 sw=4 et
 au BufNewFile,BufRead *.cs :se ts=4 sw=4
 au BufNewFile,BufRead *.pas :se ts=2 sw=2 et
 au BufNewFile,BufRead *.rb :se ts=2 sw=2 et
+au BufNewFile,BufRead *.xml :se ts=2 sw=2 et