Index: .settings/org.eclipse.cdt.core.prefs
===================================================================
--- .settings/org.eclipse.cdt.core.prefs	(revision d44e0013efd9bd49fb468b5195d1d3274e61d734)
+++ .settings/org.eclipse.cdt.core.prefs	(revision 8b685e04beaf691817ee41b1878629ce0753f6a0)
@@ -1,3 +1,4 @@
 eclipse.preferences.version=1
+org.eclipse.cdt.core.code_formatter=org.eclipse.cdt.core.defaultCodeFormatter
 org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.cdt.core.formatter.alignment_for_assignment=16
@@ -22,8 +23,9 @@
 org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration=end_of_line
 org.eclipse.cdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.cdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.cdt.core.formatter.comment.line_up_line_comment_in_blocks_on_first_column=false
 org.eclipse.cdt.core.formatter.comment.min_distance_between_code_and_line_comment=1
 org.eclipse.cdt.core.formatter.comment.never_indent_line_comments_on_first_column=true
-org.eclipse.cdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true
+org.eclipse.cdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
 org.eclipse.cdt.core.formatter.compact_else_if=true
 org.eclipse.cdt.core.formatter.continuation_indentation=2
@@ -57,5 +59,5 @@
 org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters=insert
 org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
 org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause=insert
 org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case=insert
@@ -74,5 +76,5 @@
 org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments=do not insert
 org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
 org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket=do not insert
 org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
@@ -95,5 +97,5 @@
 org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments=do not insert
 org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
 org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket=do not insert
 org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
Index: .settings/org.eclipse.cdt.ui.prefs
===================================================================
--- .settings/org.eclipse.cdt.ui.prefs	(revision d44e0013efd9bd49fb468b5195d1d3274e61d734)
+++ .settings/org.eclipse.cdt.ui.prefs	(revision 8b685e04beaf691817ee41b1878629ce0753f6a0)
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-formatter_profile=_Buchla
+formatter_profile=_Thomas 8
 formatter_settings_version=1