diff --git a/src/python/review/inspectors/checkstyle/checkstyle.py b/src/python/review/inspectors/checkstyle/checkstyle.py
index c796fbf9..e16d3373 100644
--- a/src/python/review/inspectors/checkstyle/checkstyle.py
+++ b/src/python/review/inspectors/checkstyle/checkstyle.py
@@ -20,10 +20,6 @@
 class CheckstyleInspector(BaseInspector):
     inspector_type = InspectorType.CHECKSTYLE
 
-    skipped_issues = [
-        'EmptyLineSeparatorCheck',
-    ]
-
     origin_class_to_pattern = {
         'CyclomaticComplexityCheck':
             r'Cyclomatic Complexity is (\d+)',
@@ -52,14 +48,10 @@ def inspect(self, path: Path, config: dict) -> List[BaseIssue]:
             command = self._create_command(path, output_path)
             run_in_subprocess(command)
 
-            issues = parse_checkstyle_file_result(Path(output_path),
-                                                  self.inspector_type,
-                                                  self.choose_issue_type,
-                                                  self.origin_class_to_pattern)
-            return [
-                issue for issue in issues
-                if issue.origin_class not in self.skipped_issues
-            ]
+            return parse_checkstyle_file_result(Path(output_path),
+                                                self.inspector_type,
+                                                self.choose_issue_type,
+                                                self.origin_class_to_pattern)
 
     @classmethod
     def choose_issue_type(cls, check_class: str) -> IssueType:
diff --git a/src/python/review/inspectors/checkstyle/files/checkstyle.jar b/src/python/review/inspectors/checkstyle/files/checkstyle.jar
index f1f720eb..9b6d6e7d 100644
Binary files a/src/python/review/inspectors/checkstyle/files/checkstyle.jar and b/src/python/review/inspectors/checkstyle/files/checkstyle.jar differ
diff --git a/src/python/review/inspectors/checkstyle/files/config.xml b/src/python/review/inspectors/checkstyle/files/config.xml
index 00222e43..aceb7d8c 100644
--- a/src/python/review/inspectors/checkstyle/files/config.xml
+++ b/src/python/review/inspectors/checkstyle/files/config.xml
@@ -4,26 +4,15 @@
         "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <module name="Checker">
-    <property name="fileExtensions" value="java, properties, xml"/>
+    <property name="fileExtensions" value="java"/>
 
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <!--    <module name="NewlineAtEndOfFile"/>-->
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See http://checkstyle.sf.net/config_misc.html -->
-<!--    <module name="RegexpSingleline">-->
-<!--        <property name="format" value="\s+$"/>-->
-<!--        <property name="minimum" value="0"/>-->
-<!--        <property name="maximum" value="0"/>-->
-<!--        <property name="message" value="Line has trailing spaces."/>-->
-<!--    </module>-->
+    <!-- Size Violations -->
+    <module name="LineLength">
+        <property name="max" value="120"/>
+    </module>
 
     <module name="TreeWalker">
-<!--        <module name="SuppressionCommentFilter"/>-->
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <!-- Block Checks -->
         <module name="AvoidNestedBlocks">
             <property name="allowInSwitchCase" value="true"/>
         </module>
@@ -33,19 +22,21 @@
         <module name="NeedBraces"/>
         <module name="RightCurly"/>
 
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <!-- Coding -->
+        <module name="ArrayTrailingComma"/>
         <module name="CovariantEquals"/>
         <module name="DefaultComesLast"/>
         <module name="EmptyStatement"/>
         <module name="EqualsAvoidNull"/>
         <module name="EqualsHashCode"/>
         <module name="FallThrough"/>
+        <module name="MagicNumber"/>
         <module name="MissingSwitchDefault"/>
         <module name="ModifiedControlVariable"/>
         <module name="MultipleStringLiterals">
-            <property name="allowedDuplicates" value="2"/>
-            <property name="ignoreStringsRegexp" value="^.{1,5}$"/>
+            <!-- Consistent with the AvoidDuplicateLiterals rule from PMD config -->
+            <property name="allowedDuplicates" value="3"/>
+            <property name="ignoreStringsRegexp" value="^.{1,2}$"/>
         </module>
         <module name="MultipleVariableDeclarations"/>
         <module name="NoFinalizer"/>
@@ -57,34 +48,35 @@
         <module name="StringLiteralEquality"/>
         <module name="UnnecessaryParentheses"/>
 
-<!--        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/> Since Checkstyle 8.24 -->
-<!--        <module name="VariableDeclarationUsageDistance"/>-->
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <!-- Imports  -->
         <module name="RedundantImport"/>
         <module name="UnusedImports">
             <property name="processJavadoc" value="false"/>
         </module>
 
-        <!-- Miscellaneous other checks                    -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <!-- Metrics -->
+        <module name="BooleanExpressionComplexity">
+            <property name="max" value="0"/>
+        </module>
+        <module name="CyclomaticComplexity">
+            <property name="max" value="0"/>
+            <property name="switchBlockAsSingleDecisionPoint" value="true"/>
+        </module>
+        <module name="JavaNCSS">
+            <property name="methodMaximum" value="0"/>
+        </module>
+
+        <!-- Miscellaneous -->
         <module name="ArrayTypeStyle"/>
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
+        <module name="CommentsIndentation"/>
         <module name="Indentation"/>
+        <module name="UpperEll"/>
 
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <!-- Modifiers -->
         <module name="ModifierOrder"/>
-<!--        <module name="RedundantModifier"/>-->
 
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="AbbreviationAsWordInName">
-            <property name="allowedAbbreviationLength" value="3"/>
-        </module>
+        <!-- Naming Conventions -->
+        <module name="AbbreviationAsWordInName"/>
         <module name="ConstantName">
             <property name="format" value="^log(ger)?$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
         </module>
@@ -98,16 +90,13 @@
         <module name="StaticVariableName"/>
         <module name="TypeName"/>
 
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="120"/>
+        <!-- Size Violations -->
+        <module name="ParameterNumber">
+            <!-- Consistent with the ExcessiveParameterList rule from PMD config -->
+            <property name="max" value="9"/>
         </module>
-<!--        <module name="MethodLength"/>-->
-        <module name="ParameterNumber"/>
 
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <!-- Whitespaces -->
         <module name="EmptyForIteratorPad"/>
         <module name="EmptyLineSeparator">
             <property name="allowNoEmptyLineBetweenFields" value="true"/>
@@ -118,27 +107,14 @@
         <module name="NoWhitespaceBefore"/>
         <module name="OperatorWrap">
             <property name="tokens"
-                value="ASSIGN,DIV_ASSIGN,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,MOD_ASSIGN,
+                      value="ASSIGN,DIV_ASSIGN,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,MOD_ASSIGN,
                 SR_ASSIGN,BSR_ASSIGN,SL_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN,BAND_ASSIGN"/>
             <property name="option" value="eol"/>
         </module>
-
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
 
-        <!-- Metrics -->
-        <module name="BooleanExpressionComplexity">
-            <property name="max" value="0"/>
-        </module>
-        <module name="JavaNCSS">
-            <property name="methodMaximum" value="0"/>
-        </module>
-        <module name="CyclomaticComplexity">
-            <property name="max" value="0"/>
-            <property name="switchBlockAsSingleDecisionPoint" value="true"/>
-        </module>
-
     </module>
 </module>
diff --git a/src/python/review/inspectors/checkstyle/issue_types.py b/src/python/review/inspectors/checkstyle/issue_types.py
index f89f56b7..8b32e097 100644
--- a/src/python/review/inspectors/checkstyle/issue_types.py
+++ b/src/python/review/inspectors/checkstyle/issue_types.py
@@ -3,158 +3,214 @@
 from src.python.review.inspectors.issue import IssueType
 
 CHECK_CLASS_NAME_TO_ISSUE_TYPE: Dict[str, IssueType] = {
-    'AbbreviationAsWordInNameCheck': IssueType.CODE_STYLE,
-    'AbstractClassNameCheck': IssueType.CODE_STYLE,
-    'AnnotationLocationCheck': IssueType.CODE_STYLE,
-    'AnnotationOnSameLineCheck': IssueType.CODE_STYLE,
-    'AnnotationUseStyleCheck': IssueType.CODE_STYLE,
-    'AnonInnerLengthCheck': IssueType.CODE_STYLE,
-    'ArrayTrailingCommaCheck': IssueType.CODE_STYLE,
-    'ArrayTypeStyleCheck': IssueType.CODE_STYLE,
-    'AtclauseOrderCheck': IssueType.CODE_STYLE,
-    'AvoidInlineConditionalsCheck': IssueType.BEST_PRACTICES,
+    # ---- Annotations ----
+    # 'AnnotationLocationCheck': IssueType.CODE_STYLE,
+    # 'AnnotationOnSameLineCheck': IssueType.CODE_STYLE,
+    # 'AnnotationUseStyleCheck': IssueType.CODE_STYLE,
+    # 'MissingDeprecatedCheck': IssueType.CODE_STYLE,
+    # 'MissingOverrideCheck': IssueType.CODE_STYLE,
+    # 'PackageAnnotationCheck': IssueType.CODE_STYLE,
+    # 'SuppressWarningsCheck': IssueType.BEST_PRACTICES,
+    # 'SuppressWarningsHolderCheck': IssueType.BEST_PRACTICES,
+
+    # ---- Block Checks ----
     'AvoidNestedBlocksCheck': IssueType.BEST_PRACTICES,
-    'AvoidStarImportCheck': IssueType.BEST_PRACTICES,
-    'AvoidStaticImportCheck': IssueType.BEST_PRACTICES,
-    'BooleanExpressionComplexityCheck': IssueType.BOOL_EXPR_LEN,
-    'CatchParameterNameCheck': IssueType.CODE_STYLE,
-    'ClassFanOutComplexityCheck': IssueType.CODE_STYLE,
-    'ClassTypeParameterNameCheck': IssueType.CODE_STYLE,
-    'CommentsIndentationCheck': IssueType.CODE_STYLE,
-    'ConstantNameCheck': IssueType.CODE_STYLE,
-    'CovariantEqualsCheck': IssueType.ERROR_PRONE,
-    'CustomImportOrderCheck': IssueType.CODE_STYLE,
-    'CyclomaticComplexityCheck': IssueType.CYCLOMATIC_COMPLEXITY,
-    'DeclarationOrderCheck': IssueType.CODE_STYLE,
-    'DefaultComesLastCheck': IssueType.BEST_PRACTICES,
-    'DescendantTokenCheck': IssueType.CODE_STYLE,
-    'DesignForExtensionCheck': IssueType.CODE_STYLE,
     'EmptyBlockCheck': IssueType.BEST_PRACTICES,
     'EmptyCatchBlockCheck': IssueType.BEST_PRACTICES,
-    'EmptyForInitializerPadCheck': IssueType.BEST_PRACTICES,
-    'EmptyForIteratorPadCheck': IssueType.BEST_PRACTICES,
-    'EmptyLineSeparatorCheck': IssueType.BEST_PRACTICES,
+    'LeftCurlyCheck': IssueType.CODE_STYLE,
+    'NeedBracesCheck': IssueType.CODE_STYLE,
+    'RightCurlyCheck': IssueType.CODE_STYLE,
+
+    # ---- Class Design ----
+    # 'DesignForExtensionCheck': IssueType.CODE_STYLE,
+    # 'FinalClassCheck': IssueType.CODE_STYLE,
+    # 'HideUtilityClassConstructorCheck': IssueType.CODE_STYLE,
+    # 'InnerTypeLastCheck': IssueType.CODE_STYLE,
+    # 'InterfaceIsTypeCheck': IssueType.CODE_STYLE,
+    # 'MutableExceptionCheck': IssueType.BEST_PRACTICES,
+    # 'OneTopLevelClassCheck': IssueType.BEST_PRACTICES,
+    # 'ThrowsCountCheck': IssueType.BEST_PRACTICES,
+    # 'VisibilityModifierCheck': IssueType.BEST_PRACTICES,
+
+    # ---- Coding ----
+    'ArrayTrailingCommaCheck': IssueType.INFO,
+    'CovariantEqualsCheck': IssueType.ERROR_PRONE,
+    'DefaultComesLastCheck': IssueType.BEST_PRACTICES,
     'EmptyStatementCheck': IssueType.BEST_PRACTICES,
     'EqualsAvoidNullCheck': IssueType.BEST_PRACTICES,
     'EqualsHashCodeCheck': IssueType.ERROR_PRONE,
-    'ExecutableStatementCountCheck': IssueType.BEST_PRACTICES,
-    'ExplicitInitializationCheck': IssueType.BEST_PRACTICES,
     'FallThroughCheck': IssueType.ERROR_PRONE,
-    'FileLengthCheck': IssueType.CODE_STYLE,
-    'FileTabCharacterCheck': IssueType.CODE_STYLE,
-    'FinalClassCheck': IssueType.CODE_STYLE,
-    'FinalLocalVariableCheck': IssueType.CODE_STYLE,
-    'FinalParametersCheck': IssueType.CODE_STYLE,
-    'GenericWhitespaceCheck': IssueType.CODE_STYLE,
-    'HeaderCheck': IssueType.CODE_STYLE,
-    'HiddenFieldCheck': IssueType.CODE_STYLE,
-    'IllegalCatchCheck': IssueType.ERROR_PRONE,
-    'IllegalImportCheck': IssueType.ERROR_PRONE,
-    'IllegalInstantiationCheck': IssueType.ERROR_PRONE,
-    'IllegalThrowsCheck': IssueType.ERROR_PRONE,
-    'IllegalTokenCheck': IssueType.ERROR_PRONE,
-    'IllegalTokenTextCheck': IssueType.ERROR_PRONE,
-    'IllegalTypeCheck': IssueType.ERROR_PRONE,
-    'ImportControlCheck': IssueType.CODE_STYLE,
-    'ImportOrderCheck': IssueType.CODE_STYLE,
-    'IndentationCheck': IssueType.CODE_STYLE,
-    'InnerAssignmentCheck': IssueType.CODE_STYLE,
-    'InnerTypeLastCheck': IssueType.CODE_STYLE,
-    'InterfaceIsTypeCheck': IssueType.CODE_STYLE,
-    'JavadocBlockTagLocationCheck': IssueType.CODE_STYLE,
-    'JavadocMethodCheck': IssueType.CODE_STYLE,
-    'JavadocPackageCheck': IssueType.CODE_STYLE,
-    'JavadocParagraphCheck': IssueType.CODE_STYLE,
-    'JavadocStyleCheck': IssueType.CODE_STYLE,
-    'JavadocTypeCheck': IssueType.CODE_STYLE,
-    'JavadocVariableCheck': IssueType.CODE_STYLE,
-    'JavaNCSSCheck': IssueType.FUNC_LEN,
-    'LambdaParameterNameCheck': IssueType.CODE_STYLE,
-    'LeftCurlyCheck': IssueType.CODE_STYLE,
-    'LineLengthCheck': IssueType.LINE_LEN,
-    'LocalFinalVariableNameCheck': IssueType.CODE_STYLE,
-    'LocalVariableNameCheck': IssueType.CODE_STYLE,
-    'MagicNumberCheck': IssueType.BEST_PRACTICES,
-    'MemberNameCheck': IssueType.CODE_STYLE,
-    'MethodCountCheck': IssueType.CODE_STYLE,
-    'MethodLengthCheck': IssueType.BEST_PRACTICES,
-    'MethodNameCheck': IssueType.CODE_STYLE,
-    'MethodParamPadCheck': IssueType.CODE_STYLE,
-    'MethodTypeParameterNameCheck': IssueType.CODE_STYLE,
-    'MissingCtorCheck': IssueType.ERROR_PRONE,
-    'MissingDeprecatedCheck': IssueType.CODE_STYLE,
-    'MissingJavadocMethodCheck': IssueType.CODE_STYLE,
-    'MissingJavadocPackageCheck': IssueType.CODE_STYLE,
-    'MissingJavadocTypeCheck': IssueType.CODE_STYLE,
-    'MissingOverrideCheck': IssueType.CODE_STYLE,
+    'MagicNumberCheck': IssueType.INFO,
     'MissingSwitchDefaultCheck': IssueType.ERROR_PRONE,
     'ModifiedControlVariableCheck': IssueType.BEST_PRACTICES,
-    'ModifierOrderCheck': IssueType.CODE_STYLE,
     'MultipleStringLiteralsCheck': IssueType.BEST_PRACTICES,
     'MultipleVariableDeclarationsCheck': IssueType.CODE_STYLE,
-    'MutableExceptionCheck': IssueType.BEST_PRACTICES,
-    'NeedBracesCheck': IssueType.CODE_STYLE,
-    'NestedForDepthCheck': IssueType.BEST_PRACTICES,
-    'NestedIfDepthCheck': IssueType.BEST_PRACTICES,
-    'NestedTryDepthCheck': IssueType.BEST_PRACTICES,
-    'NewlineAtEndOfFileCheck': IssueType.CODE_STYLE,
-    'NoCloneCheck': IssueType.ERROR_PRONE,
     'NoFinalizerCheck': IssueType.ERROR_PRONE,
-    'NoLineWrapCheck': IssueType.CODE_STYLE,
-    'NoWhitespaceAfterCheck': IssueType.CODE_STYLE,
-    'NoWhitespaceBeforeCheck': IssueType.CODE_STYLE,
-    'NPathComplexityCheck': IssueType.COMPLEXITY,
     'OneStatementPerLineCheck': IssueType.CODE_STYLE,
-    'OneTopLevelClassCheck': IssueType.BEST_PRACTICES,
-    'OperatorWrapCheck': IssueType.CODE_STYLE,
-    'OrderedPropertiesCheck': IssueType.CODE_STYLE,
-    'OuterTypeFilenameCheck': IssueType.CODE_STYLE,
-    'OuterTypeNumberCheck': IssueType.CODE_STYLE,
     'OverloadMethodsDeclarationOrderCheck': IssueType.BEST_PRACTICES,
-    'PackageAnnotationCheck': IssueType.CODE_STYLE,
-    'PackageDeclarationCheck': IssueType.CODE_STYLE,
-    'PackageNameCheck': IssueType.CODE_STYLE,
     'ParameterAssignmentCheck': IssueType.BEST_PRACTICES,
-    'ParameterNameCheck': IssueType.CODE_STYLE,
-    'ParameterNumberCheck': IssueType.BEST_PRACTICES,
-    'ParenPadCheck': IssueType.CODE_STYLE,
-    'RedundantImportCheck': IssueType.BEST_PRACTICES,
-    'RedundantModifierCheck': IssueType.BEST_PRACTICES,
-    'RegexpCheck': IssueType.ERROR_PRONE,
-    'RegexpHeaderCheck': IssueType.ERROR_PRONE,
-    'RegexpMultilineCheck': IssueType.ERROR_PRONE,
-    'RegexpOnFilenameCheck': IssueType.ERROR_PRONE,
-    'RegexpSinglelineCheck': IssueType.BEST_PRACTICES,
-    'RegexpSinglelineJavaCheck': IssueType.ERROR_PRONE,
-    'RequireThisCheck': IssueType.ERROR_PRONE,
-    'ReturnCountCheck': IssueType.BEST_PRACTICES,
-    'RightCurlyCheck': IssueType.CODE_STYLE,
-    'SeparatorWrapCheck': IssueType.CODE_STYLE,
-    'SimplifyBooleanReturnCheck': IssueType.BEST_PRACTICES,
     'SimplifyBooleanExpressionCheck': IssueType.BEST_PRACTICES,
-    'SingleLineJavadocCheck': IssueType.CODE_STYLE,
-    'SingleSpaceSeparatorCheck': IssueType.CODE_STYLE,
-    'StaticVariableNameCheck': IssueType.CODE_STYLE,
+    'SimplifyBooleanReturnCheck': IssueType.BEST_PRACTICES,
     'StringLiteralEqualityCheck': IssueType.ERROR_PRONE,
-    'SummaryJavadocCheck': IssueType.CODE_STYLE,
-    'SuperCloneCheck': IssueType.ERROR_PRONE,
-    'SuperFinalizeCheck': IssueType.ERROR_PRONE,
-    'SuppressWarningsCheck': IssueType.BEST_PRACTICES,
-    'ThrowsCountCheck': IssueType.BEST_PRACTICES,
-    'TodoCommentCheck': IssueType.BEST_PRACTICES,
-    'TrailingCommentCheck': IssueType.CODE_STYLE,
-    'TranslationCheck': IssueType.BEST_PRACTICES,
-    'TypecastParenPadCheck': IssueType.CODE_STYLE,
-    'TypeNameCheck': IssueType.CODE_STYLE,
-    'UncommentedMainCheck': IssueType.BEST_PRACTICES,
-    'UniquePropertiesCheck': IssueType.ERROR_PRONE,
     'UnnecessaryParenthesesCheck': IssueType.CODE_STYLE,
-    'UnnecessarySemicolonAfterTypeMemberDeclarationCheck': IssueType.CODE_STYLE,
+    # 'AvoidDoubleBraceInitializationCheck': IssueType.BEST_PRACTICES,
+    # 'AvoidInlineConditionalsCheck': IssueType.BEST_PRACTICES,
+    # 'AvoidNoArgumentSuperConstructorCallCheck': IssueType.BEST_PRACTICES,
+    # 'DeclarationOrderCheck': IssueType.CODE_STYLE,
+    # 'ExplicitInitializationCheck': IssueType.BEST_PRACTICES,
+    # 'FinalLocalVariableCheck': IssueType.CODE_STYLE,
+    # 'HiddenFieldCheck': IssueType.CODE_STYLE,
+    # 'IllegalCatchCheck': IssueType.ERROR_PRONE,
+    # 'IllegalInstantiationCheck': IssueType.ERROR_PRONE,
+    # 'IllegalThrowsCheck': IssueType.ERROR_PRONE,
+    # 'IllegalTokenCheck': IssueType.ERROR_PRONE,
+    # 'IllegalTokenTextCheck': IssueType.ERROR_PRONE,
+    # 'IllegalTypeCheck': IssueType.ERROR_PRONE,
+    # 'InnerAssignmentCheck': IssueType.CODE_STYLE,
+    # 'MatchXpathCheck': IssueType.BEST_PRACTICES,
+    # 'MissingCtorCheck': IssueType.ERROR_PRONE,
+    # 'NestedForDepthCheck': IssueType.BEST_PRACTICES,
+    # 'NestedIfDepthCheck': IssueType.BEST_PRACTICES,
+    # 'NestedTryDepthCheck': IssueType.BEST_PRACTICES,
+    # 'NoArrayTrailingCommaCheck': IssueType.CODE_STYLE,
+    # 'NoCloneCheck': IssueType.ERROR_PRONE,
+    # 'NoEnumTrailingCommaCheck': IssueType.CODE_STYLE,
+    # 'PackageDeclarationCheck': IssueType.CODE_STYLE,
+    # 'RequireThisCheck': IssueType.ERROR_PRONE,
+    # 'ReturnCountCheck': IssueType.BEST_PRACTICES,
+    # 'SuperCloneCheck': IssueType.ERROR_PRONE,
+    # 'SuperFinalizeCheck': IssueType.ERROR_PRONE,
+    # 'UnnecessarySemicolonAfterOuterTypeDeclarationCheck': IssueType.CODE_STYLE,
+    # 'UnnecessarySemicolonAfterTypeMemberDeclarationCheck': IssueType.CODE_STYLE,
+    # 'UnnecessarySemicolonInEnumerationCheck': IssueType.CODE_STYLE,
+    # 'UnnecessarySemicolonInTryWithResourcesCheck': IssueType.CODE_STYLE,
+    # 'VariableDeclarationUsageDistanceCheck': IssueType.CODE_STYLE,
+
+    # ---- Headers ----
+    # 'HeaderCheck': IssueType.CODE_STYLE,
+    # 'RegexpHeaderCheck': IssueType.ERROR_PRONE,
+
+    # ---- Imports ----
+    'RedundantImportCheck': IssueType.BEST_PRACTICES,
     'UnusedImportsCheck': IssueType.BEST_PRACTICES,
+    # 'AvoidStarImportCheck': IssueType.BEST_PRACTICES,
+    # 'AvoidStaticImportCheck': IssueType.BEST_PRACTICES,
+    # 'CustomImportOrderCheck': IssueType.CODE_STYLE,
+    # 'IllegalImportCheck': IssueType.ERROR_PRONE,
+    # 'ImportControlCheck': IssueType.CODE_STYLE,
+    # 'ImportOrderCheck': IssueType.CODE_STYLE,
+
+    # ---- Javadoc Comments ----
+    # 'AtclauseOrderCheck': IssueType.CODE_STYLE,
+    # 'InvalidJavadocPositionCheck': IssueType.CODE_STYLE,
+    # 'JavadocBlockTagLocationCheck': IssueType.CODE_STYLE,
+    # 'JavadocContentLocationCheck': IssueType.CODE_STYLE,
+    # 'JavadocMethodCheck': IssueType.CODE_STYLE,
+    # 'JavadocMissingLeadingAsteriskCheck': IssueType.CODE_STYLE,
+    # 'JavadocMissingWhitespaceAfterAsteriskCheck': IssueType.CODE_STYLE,
+    # 'JavadocPackageCheck': IssueType.CODE_STYLE,
+    # 'JavadocParagraphCheck': IssueType.CODE_STYLE,
+    # 'JavadocStyleCheck': IssueType.CODE_STYLE,
+    # 'JavadocTagContinuationIndentationCheck': IssueType.CODE_STYLE,
+    # 'JavadocTypeCheck': IssueType.CODE_STYLE,
+    # 'JavadocVariableCheck': IssueType.CODE_STYLE,
+    # 'MissingJavadocMethodCheck': IssueType.CODE_STYLE,
+    # 'MissingJavadocPackageCheck': IssueType.CODE_STYLE,
+    # 'MissingJavadocTypeCheck': IssueType.CODE_STYLE,
+    # 'NonEmptyAtclauseDescriptionCheck': IssueType.CODE_STYLE,
+    # 'RequireEmptyLineBeforeBlockTagGroupCheck': IssueType.CODE_STYLE,
+    # 'SingleLineJavadocCheck': IssueType.CODE_STYLE,
+    # 'SummaryJavadocCheck': IssueType.CODE_STYLE,
+    # 'WriteTagCheck': IssueType.CODE_STYLE,
+
+    # ---- Metrics ----
+    'BooleanExpressionComplexityCheck': IssueType.BOOL_EXPR_LEN,
+    'CyclomaticComplexityCheck': IssueType.CYCLOMATIC_COMPLEXITY,
+    'JavaNCSSCheck': IssueType.FUNC_LEN,
+    # 'ClassDataAbstractionCouplingCheck': IssueType.COUPLING,
+    # 'ClassFanOutComplexityCheck': IssueType.CODE_STYLE,
+    # 'NPathComplexityCheck': IssueType.COMPLEXITY,
+
+    # ---- Miscellaneous ----
+    'ArrayTypeStyleCheck': IssueType.CODE_STYLE,
+    'CommentsIndentationCheck': IssueType.CODE_STYLE,
+    'IndentationCheck': IssueType.CODE_STYLE,
     'UpperEllCheck': IssueType.BEST_PRACTICES,
-    'VisibilityModifierCheck': IssueType.BEST_PRACTICES,
+    # 'AvoidEscapedUnicodeCharactersCheck': IssueType.CODE_STYLE,
+    # 'DescendantTokenCheck': IssueType.CODE_STYLE,
+    # 'FinalParametersCheck': IssueType.CODE_STYLE,
+    # 'NewlineAtEndOfFileCheck': IssueType.CODE_STYLE,
+    # 'NoCodeInFileCheck': IssueType.BEST_PRACTICES,
+    # 'OrderedPropertiesCheck': IssueType.CODE_STYLE,
+    # 'OuterTypeFilenameCheck': IssueType.CODE_STYLE,
+    # 'TodoCommentCheck': IssueType.BEST_PRACTICES,
+    # 'TrailingCommentCheck': IssueType.CODE_STYLE,
+    # 'TranslationCheck': IssueType.BEST_PRACTICES,
+    # 'UncommentedMainCheck': IssueType.BEST_PRACTICES,
+    # 'UniquePropertiesCheck': IssueType.ERROR_PRONE,
+
+    # ---- Modifiers ----
+    'ModifierOrderCheck': IssueType.CODE_STYLE,
+    # 'ClassMemberImpliedModifierCheck': IssueType.BEST_PRACTICES,
+    # 'InterfaceMemberImpliedModifierCheck': IssueType.BEST_PRACTICES,
+    # 'RedundantModifierCheck': IssueType.BEST_PRACTICES,
+
+    # ---- Naming Conventions ----
+    'AbbreviationAsWordInNameCheck': IssueType.CODE_STYLE,
+    'ConstantNameCheck': IssueType.CODE_STYLE,
+    'LambdaParameterNameCheck': IssueType.CODE_STYLE,
+    'LocalFinalVariableNameCheck': IssueType.CODE_STYLE,
+    'LocalVariableNameCheck': IssueType.CODE_STYLE,
+    'MemberNameCheck': IssueType.CODE_STYLE,
+    'MethodNameCheck': IssueType.CODE_STYLE,
+    'PackageNameCheck': IssueType.CODE_STYLE,
+    'ParameterNameCheck': IssueType.CODE_STYLE,
+    'StaticVariableNameCheck': IssueType.CODE_STYLE,
+    'TypeNameCheck': IssueType.CODE_STYLE,
+    # 'AbstractClassNameCheck': IssueType.CODE_STYLE,
+    # 'CatchParameterNameCheck': IssueType.CODE_STYLE,
+    # 'ClassTypeParameterNameCheck': IssueType.CODE_STYLE,
+    # 'IllegalIdentifierNameCheck': IssueType.CODE_STYLE,
+    # 'InterfaceTypeParameterNameCheck': IssueType.CODE_STYLE,
+    # 'MethodTypeParameterNameCheck': IssueType.CODE_STYLE,
+    # 'PatternVariableNameCheck': IssueType.CODE_STYLE,
+    # 'RecordComponentNameCheck': IssueType.CODE_STYLE,
+    # 'RecordTypeParameterNameCheck': IssueType.CODE_STYLE,
+
+    # ---- Regexp ----
+    # 'RegexpCheck': IssueType.ERROR_PRONE,
+    # 'RegexpMultilineCheck': IssueType.ERROR_PRONE,
+    # 'RegexpOnFilenameCheck': IssueType.ERROR_PRONE,
+    # 'RegexpSinglelineCheck': IssueType.BEST_PRACTICES,
+    # 'RegexpSinglelineJavaCheck': IssueType.ERROR_PRONE,
+
+    # ---- Size Violations ----
+    # 'AnonInnerLengthCheck': IssueType.CODE_STYLE,
+    # 'ExecutableStatementCountCheck': IssueType.BEST_PRACTICES,
+    # 'FileLengthCheck': IssueType.CODE_STYLE,
+    # 'LambdaBodyLengthCheck': IssueType.BEST_PRACTICES,
+    'LineLengthCheck': IssueType.LINE_LEN,
+    # 'MethodCountCheck': IssueType.CODE_STYLE,
+    # 'MethodLengthCheck': IssueType.BEST_PRACTICES,
+    # 'OuterTypeNumberCheck': IssueType.CODE_STYLE,
+    'ParameterNumberCheck': IssueType.BEST_PRACTICES,
+    # 'RecordComponentNumberCheck': IssueType.BEST_PRACTICES,
+
+    # ---- Whitespace ----
+    'EmptyForIteratorPadCheck': IssueType.BEST_PRACTICES,
+    'EmptyLineSeparatorCheck': IssueType.BEST_PRACTICES,
+    'GenericWhitespaceCheck': IssueType.CODE_STYLE,
+    'MethodParamPadCheck': IssueType.CODE_STYLE,
+    'NoWhitespaceAfterCheck': IssueType.CODE_STYLE,
+    'NoWhitespaceBeforeCheck': IssueType.CODE_STYLE,
+    'OperatorWrapCheck': IssueType.CODE_STYLE,
+    'ParenPadCheck': IssueType.CODE_STYLE,
+    'TypecastParenPadCheck': IssueType.CODE_STYLE,
     'WhitespaceAfterCheck': IssueType.CODE_STYLE,
     'WhitespaceAroundCheck': IssueType.CODE_STYLE,
-    'WriteTagCheck': IssueType.CODE_STYLE,
-    'SuppressWarningsHolderCheck': IssueType.BEST_PRACTICES,
+    # 'EmptyForInitializerPadCheck': IssueType.BEST_PRACTICES,
+    # 'FileTabCharacterCheck': IssueType.CODE_STYLE,
+    # 'NoLineWrapCheck': IssueType.CODE_STYLE,
+    # 'SeparatorWrapCheck': IssueType.CODE_STYLE,
+    # 'SingleSpaceSeparatorCheck': IssueType.CODE_STYLE,
 }
diff --git a/test/python/inspectors/test_checkstyle_inspector.py b/test/python/inspectors/test_checkstyle_inspector.py
index ce7040aa..f13062aa 100644
--- a/test/python/inspectors/test_checkstyle_inspector.py
+++ b/test/python/inspectors/test_checkstyle_inspector.py
@@ -10,39 +10,39 @@
     ('test_simple_valid_program.java', 0),
     ('test_spaces.java', 14),
     ('test_valid_spaces.java', 0),
-    ('test_curly_braces.java', 2),
+    ('test_curly_braces.java', 6),
     ('test_valid_curly_braces.java', 0),
     ('test_invalid_naming.java', 14),
     ('test_valid_naming.java', 0),
     ('test_unused_imports.java', 5),
     ('test_blocks.java', 5),
     ('test_valid_blocks.java', 0),
-    ('test_magic_numbers.java', 0),
+    ('test_magic_numbers.java', 1),
     ('test_ternary_operator.java', 0),
-    ('test_todo.java', 3),
+    ('test_todo.java', 0),
     ('test_upper_ell.java', 1),
     ('test_missing_default.java', 1),
     ('test_valid_default.java', 0),
     ('test_array_type.java', 1),
     ('test_algorithm_with_scanner.java', 0),
     ('test_valid_algorithm_1.java', 0),
-    ('test_nested_blocks.java', 2),
-    ('test_reassigning_example.java', 2),
-    ('test_switch_statement.java', 3),
+    ('test_nested_blocks.java', 5),
+    ('test_reassigning_example.java', 4),
+    ('test_switch_statement.java', 16),
     ('test_when_only_equals_overridden.java', 1),
     ('test_constants.java', 4),
     # ("test_empty_lines_btw_members.java", 2),
     ('test_covariant_equals.java', 1),
-    ('test_multi_statements.java', 4),
-    ('test_boolean_expr.java', 2),
-    ('test_code_with_comments.java', 0),
-    ('test_too_long_method.java', 1),
-    ('test_cyclomatic_complexity.java', 0),
-    ('test_cyclomatic_complexity_bad.java', 1),
+    ('test_multi_statements.java', 7),
+    ('test_boolean_expr.java', 3),
+    ('test_code_with_comments.java', 2),
+    ('test_too_long_method.java', 4),
+    ('test_cyclomatic_complexity.java', 8),
+    ('test_cyclomatic_complexity_bad.java', 22),
     ('test_long_lines.java', 1),
-    ('test_indentation_with_spaces.java', 0),
-    ('test_indentation_with_tabs.java', 0),
-    ('test_indentation_google_style.java', 4),
+    ('test_indentation_with_spaces.java', 5),
+    ('test_indentation_with_tabs.java', 5),
+    ('test_indentation_google_style.java', 6),
 ]
 
 
diff --git a/test/resources/evaluation/xlsx_target_files/target_sorted_order.xlsx b/test/resources/evaluation/xlsx_target_files/target_sorted_order.xlsx
index 1b9ed1dc..289925fa 100644
Binary files a/test/resources/evaluation/xlsx_target_files/target_sorted_order.xlsx and b/test/resources/evaluation/xlsx_target_files/target_sorted_order.xlsx differ
diff --git a/test/resources/evaluation/xlsx_target_files/target_unsorted_order.xlsx b/test/resources/evaluation/xlsx_target_files/target_unsorted_order.xlsx
index 0fe8ca6f..f3ff97b6 100644
Binary files a/test/resources/evaluation/xlsx_target_files/target_unsorted_order.xlsx and b/test/resources/evaluation/xlsx_target_files/target_unsorted_order.xlsx differ
diff --git a/whitelist.txt b/whitelist.txt
index 92f5e9ce..5e10335d 100644
--- a/whitelist.txt
+++ b/whitelist.txt
@@ -176,3 +176,9 @@ stmts
 cloneable
 slf4j
 removeprefix
+Javadoc
+Uncommented
+Singleline
+Xpath
+Ctor
+Atclause