WS-2021.3 <TheoryOfNekomata@VALHALLA Merge branch 'master'

Conflicts:
	colors/_@user_Darcula.icls

baseRefactoring.xml

@@ -0,0 +1,5 @@
+<application>
+  <component name="BaseRefactoringSettings">
+    <option name="RENAME_SEARCH_IN_COMMENTS_FOR_FILE" value="false" />
+  </component>
+</application>