diff --git a/colorSchemes/src/colorSchemes/all_hallows_eve.xml b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
index 92a6f4f92c5c..7bdf0d5fa076 100644
--- a/colorSchemes/src/colorSchemes/all_hallows_eve.xml
+++ b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
@@ -960,8 +960,8 @@
     </option>
     <option baseAttributes="TEXT" name="OC.DOT" />
     <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.EXTERN_VARIABLE" />
-    <option baseAttributes="TEXT" name="OC.FUNCTION_CALL" />
-    <option baseAttributes="MESSAGE_ARGUMENT" name="OC.FUNCTION_CALL" />
+    <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
     <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.GLOBAL_VARIABLE" />
     <option name="OC.KEYWORD">
       <value>
diff --git a/colorSchemes/src/colorSchemes/blackboard.xml b/colorSchemes/src/colorSchemes/blackboard.xml
index 7fcd2f6329e2..a8eb680c9761 100644
--- a/colorSchemes/src/colorSchemes/blackboard.xml
+++ b/colorSchemes/src/colorSchemes/blackboard.xml
@@ -944,16 +944,8 @@
     </option>
     <option baseAttributes="TEXT" name="OC.DOT" />
     <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.EXTERN_VARIABLE" />
-    <option name="OC.FUNCTION_CALL">
-      <value>
-        <option name="FOREGROUND" value="FF6400" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION_DECLARATION">
-      <value>
-        <option name="FOREGROUND" value="FF6400" />
-      </value>
-    </option>
+    <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
     <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.GLOBAL_VARIABLE" />
     <option name="OC.KEYWORD">
       <value>
diff --git a/colorSchemes/src/colorSchemes/cobalt.xml b/colorSchemes/src/colorSchemes/cobalt.xml
index f7e17d601937..1a253eb885d4 100644
--- a/colorSchemes/src/colorSchemes/cobalt.xml
+++ b/colorSchemes/src/colorSchemes/cobalt.xml
@@ -1172,16 +1172,8 @@
         <option name="FOREGROUND" value="CCCCCC" />
       </value>
     </option>
-    <option name="OC.FUNCTION_CALL">
-      <value>
-        <option name="FOREGROUND" value="FFDD00" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION_DECLARATION">
-      <value>
-        <option name="FOREGROUND" value="FFDD00" />
-      </value>
-    </option>
+    <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
     <option name="OC.GLOBAL_VARIABLE">
       <value>
         <option name="FOREGROUND" value="CCCCCC" />
diff --git a/colorSchemes/src/colorSchemes/github.xml b/colorSchemes/src/colorSchemes/github.xml
index 2d7c88ff7231..77f7ef3ef421 100644
--- a/colorSchemes/src/colorSchemes/github.xml
+++ b/colorSchemes/src/colorSchemes/github.xml
@@ -1066,18 +1066,8 @@
         <option name="FOREGROUND" value="108888" />
       </value>
     </option>
-    <option name="OC.FUNCTION_CALL">
-      <value>
-        <option name="FOREGROUND" value="990000" />
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION_DECLARATION">
-      <value>
-        <option name="FOREGROUND" value="990000" />
-        <option name="FONT_TYPE" value="1" />
-      </value>
-    </option>
+    <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
     <option name="OC.GLOBAL_VARIABLE">
       <value>
         <option name="FOREGROUND" value="108888" />
diff --git a/colorSchemes/src/colorSchemes/monokai.xml b/colorSchemes/src/colorSchemes/monokai.xml
index d0a6a45abb67..5afed23e69ce 100644
--- a/colorSchemes/src/colorSchemes/monokai.xml
+++ b/colorSchemes/src/colorSchemes/monokai.xml
@@ -948,16 +948,8 @@
     </option>
     <option baseAttributes="TEXT" name="OC.DOT" />
     <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.EXTERN_VARIABLE" />
-    <option name="OC.FUNCTION_CALL">
-      <value>
-        <option name="FOREGROUND" value="A6E22E" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION_DECLARATION">
-      <value>
-        <option name="FOREGROUND" value="A6E22E" />
-      </value>
-    </option>
+    <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
     <option baseAttributes="OC.LOCAL_VARIABLE" name="OC.GLOBAL_VARIABLE" />
     <option name="OC.KEYWORD">
       <value>
diff --git a/colorSchemes/src/colorSchemes/rails_casts.xml b/colorSchemes/src/colorSchemes/rails_casts.xml
index edbe8a9ba005..9b62d6e8e33e 100644
--- a/colorSchemes/src/colorSchemes/rails_casts.xml
+++ b/colorSchemes/src/colorSchemes/rails_casts.xml
@@ -1028,16 +1028,8 @@
         <option name="FOREGROUND" value="D0D0FF" />
       </value>
     </option>
-    <option name="OC.FUNCTION_CALL">
-      <value>
-        <option name="FOREGROUND" value="FFC66D" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION_DECLARATION">
-      <value>
-        <option name="FOREGROUND" value="FFC66D" />
-      </value>
-    </option>
+    <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
     <option name="OC.GLOBAL_VARIABLE">
       <value>
         <option name="FOREGROUND" value="D0D0FF" />
diff --git a/colorSchemes/src/colorSchemes/twilight.xml b/colorSchemes/src/colorSchemes/twilight.xml
index a0b1c37ed348..16c639f06e22 100644
--- a/colorSchemes/src/colorSchemes/twilight.xml
+++ b/colorSchemes/src/colorSchemes/twilight.xml
@@ -1039,16 +1039,8 @@
         <option name="FOREGROUND" value="7587A6" />
       </value>
     </option>
-    <option name="OC.FUNCTION_CALL">
-      <value>
-        <option name="FOREGROUND" value="9B703F" />
-      </value>
-    </option>
-    <option name="OC.FUNCTION_DECLARATION">
-      <value>
-        <option name="FOREGROUND" value="9B703F" />
-      </value>
-    </option>
+    <option baseAttributes="DEFAULT_FUNCTION_CALL" name="OC.FUNCTION" />
+    <option baseAttributes="DEFAULT_FUNCTION_DECLARATION" name="OC.FUNCTION_DECLARATION" />
     <option name="OC.GLOBAL_VARIABLE">
       <value>
         <option name="FOREGROUND" value="7587A6" />