diff --git a/ide/clion/filament.xml b/ide/clion/cpp_code_style.xml
similarity index 51%
rename from ide/clion/filament.xml
rename to ide/clion/cpp_code_style.xml
index 2073528534..b4a89f5fc1 100644
--- a/ide/clion/filament.xml
+++ b/ide/clion/cpp_code_style.xml
@@ -1,8 +1,10 @@
-<code_scheme name="Filament" version="173">
+<code_scheme name="Project" version="173">
   <option name="RIGHT_MARGIN" value="100" />
   <Objective-C>
     <option name="INDENT_NAMESPACE_MEMBERS" value="0" />
-    <option name="FUNCTION_PARAMETERS_NEW_LINE_AFTER_LPAR" value="true" />
+    <option name="FUNCTION_NON_TOP_AFTER_RETURN_TYPE_WRAP" value="0" />
+    <option name="FUNCTION_TOP_AFTER_RETURN_TYPE_WRAP" value="0" />
+    <option name="FUNCTION_PARAMETERS_ALIGN_MULTILINE" value="false" />
     <option name="FUNCTION_CALL_ARGUMENTS_ALIGN_MULTILINE" value="false" />
     <option name="SUPERCLASS_LIST_BEFORE_COLON" value="0" />
     <option name="SPACE_BEFORE_POINTER_IN_DECLARATION" value="false" />
@@ -10,29 +12,29 @@
     <option name="SPACE_BEFORE_REFERENCE_IN_DECLARATION" value="false" />
     <option name="SPACE_AFTER_REFERENCE_IN_DECLARATION" value="true" />
     <option name="USE_MODERN_CASTS" value="false" />
-    <option name="FIELDS_PREFIX" value="m" />
-    <option name="INTRODUCE_AUTO_VARS" value="true" />
+    <option name="INTRODUCE_CONST_VARS" value="true" />
+    <option name="TYPE_QUALIFIERS_PLACEMENT" value="AFTER" />
+    <option name="CLASSES_AND_STRUCTS_NAMING_CONVENTION">
+      <value prefix="" style="PASCAL_CASE" suffix="" />
+    </option>
+    <option name="ENUMS_NAMING_CONVENTION">
+      <value prefix="" style="PASCAL_CASE" suffix="" />
+    </option>
+    <option name="ENUMERATORS_NAMING_CONVENTION">
+      <value prefix="" style="SCREAMING_SNAKE_CASE" suffix="" />
+    </option>
+    <option name="TYPEDEFS_NAMING_CONVENTION">
+      <value prefix="" style="PASCAL_CASE" suffix="" />
+    </option>
+    <option name="FIELDS_NAMING_CONVENTION">
+      <value prefix="m" style="PASCAL_CASE" suffix="" />
+    </option>
+    <option name="GLOBAL_VARIABLES_NAMING_CONVENTION">
+      <value prefix="g" style="PASCAL_CASE" suffix="" />
+    </option>
   </Objective-C>
   <Objective-C-extensions>
-    <file>
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-    </file>
-    <class>
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-      <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-    </class>
+    <option name="TYPE_QUALIFIERS_PLACEMENT" value="AFTER" />
     <extensions>
       <pair source="cpp" header="h" fileNamingConvention="PASCAL_CASE" />
       <pair source="c" header="h" fileNamingConvention="NONE" />
@@ -55,4 +57,4 @@
       <option name="LABEL_INDENT_ABSOLUTE" value="true" />
     </indentOptions>
   </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
+</code_scheme>
diff --git a/ide/clion/cpp_inspections.xml b/ide/clion/cpp_inspections.xml
new file mode 100644
index 0000000000..c2a1ffdfce
--- /dev/null
+++ b/ide/clion/cpp_inspections.xml
@@ -0,0 +1,9 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="ClangTidyInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="clangTidyChecks" value="*,-android-*,-bugprone-bool-pointer-implicit-conversion,-cert-env33-c,-cert-dcl50-cpp,-cert-dcl59-cpp,-cppcoreguidelines-no-malloc,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-const-cast,-cppcoreguidelines-pro-type-cstyle-cast,-cppcoreguidelines-pro-type-reinterpret-cast,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-special-member-functions,-fuchsia-*,-google-*,google-default-arguments,google-explicit-constructor,google-runtime-member-string-references,google-runtime-operator,-hicpp-braces-around-statements,-hicpp-named-parameter,-hicpp-no-array-decay,-hicpp-no-assembler,-hicpp-no-malloc,-hicpp-function-size,-hicpp-special-member-functions,-hicpp-vararg,-llvm-*,-objc-*,-readability-else-after-return,-readability-implicit-bool-conversion,-readability-named-parameter,-readability-simplify-boolean-expr,-readability-braces-around-statements,-readability-identifier-naming,-readability-function-size,-readability-redundant-member-init,-misc-bool-pointer-implicit-conversion,-misc-definitions-in-headers,-misc-unused-alias-decls,-misc-unused-parameters,-misc-unused-using-decls,-modernize-use-using,-modernize-use-default-member-init,-clang-diagnostic-*,-clang-analyzer-*,-modernize-use-auto,-cppcoreguidelines-avoid-goto,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-hicpp-signed-bitwise,-hicpp-use-auto" />
+    </inspection_tool>
+    <inspection_tool class="HidingNonVirtualFunction" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file