diff --git a/make/uncrustify/uncrustify.cfg b/make/uncrustify/uncrustify.cfg
index e4e60eb43..e4de43332 100644
--- a/make/uncrustify/uncrustify.cfg
+++ b/make/uncrustify/uncrustify.cfg
@@ -102,7 +102,7 @@ indent_namespace_limit                   = 0        # number
 indent_extern                            = false    # false/true
 
 # Whether the 'class' body is indented
-indent_class                             = false    # false/true
+indent_class                             = true     # false/true
 
 # Whether to indent the stuff after a leading class colon
 indent_class_colon                       = false    # false/true
@@ -164,7 +164,7 @@ indent_sing_line_comments                = 0        # number
 
 # If set, will indent trailing single line ('//') comments relative
 # to the code instead of trying to keep the same absolute column
-indent_relative_single_line_comments     = false    # false/true
+indent_relative_single_line_comments     = true     # false/true
 
 # Spaces to indent 'case' from 'switch'
 # Usually 0 or indent_columns.
@@ -1398,7 +1398,7 @@ mod_pawn_semicolon                       = false    # false/true
 mod_full_paren_if_bool                   = false    # false/true
 
 # Whether to remove superfluous semicolons
-mod_remove_extra_semicolon               = true     # false/true
+mod_remove_extra_semicolon               = false    # false/true
 
 # If a function body exceeds the specified number of newlines and doesn't have a comment after
 # the close brace, a comment will be added.