diff --git a/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml b/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml
index a8e5ee38e9..4f360cf949 100644
--- a/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml
+++ b/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml
@@ -17,7 +17,7 @@
         	
         	<!-- relevant for Code Climate output only -->
         	<property name="cc_categories" value="Complexity"/>
-        	<property name="cc_remediation_points_multiplier" value="100"/>
+        	<property name="cc_remediation_points_multiplier" value="150"/>
         	<property name="cc_block_highlighting" value="false"/>
     	</properties>	
 	</rule>
@@ -39,11 +39,11 @@
 		<priority>3</priority>
 		
 		<properties>
-        	<property name="minimum" value="20"/>
+        	<property name="minimum" value="25"/>
         	
         	<!-- relevant for Code Climate output only -->
         	<property name="cc_categories" value="Complexity"/>
-        	<property name="cc_remediation_points_multiplier" value="100"/>
+        	<property name="cc_remediation_points_multiplier" value="150"/>
         	<property name="cc_block_highlighting" value="false"/>
     	</properties>	
 	</rule>
@@ -56,7 +56,7 @@
         	
         	<!-- relevant for Code Climate output only -->
         	<property name="cc_categories" value="Complexity"/>
-        	<property name="cc_remediation_points_multiplier" value="10"/>
+        	<property name="cc_remediation_points_multiplier" value="50"/>
         	<property name="cc_block_highlighting" value="false"/>
     	</properties>	
 	</rule>
@@ -65,7 +65,7 @@
 		<priority>3</priority>
 		
 		<properties>
-        	<property name="minimum" value="40"/>
+        	<property name="minimum" value="60"/>
         	
         	<!-- relevant for Code Climate output only -->
         	<property name="cc_categories" value="Complexity"/>
@@ -78,11 +78,11 @@
 		<priority>3</priority>
 		
 		<properties>
-        	<property name="minimum" value="500"/>
+        	<property name="minimum" value="700"/>
         	
         	<!-- relevant for Code Climate output only -->
         	<property name="cc_categories" value="Complexity"/>
-        	<property name="cc_remediation_points_multiplier" value="100"/>
+        	<property name="cc_remediation_points_multiplier" value="250"/>
         	<property name="cc_block_highlighting" value="false"/>
     	</properties>	
 	</rule>
@@ -95,7 +95,7 @@
         	
         	<!-- relevant for Code Climate output only -->
         	<property name="cc_categories" value="Complexity"/>
-        	<property name="cc_remediation_points_multiplier" value="300"/>
+        	<property name="cc_remediation_points_multiplier" value="250"/>
         	<property name="cc_block_highlighting" value="false"/>
     	</properties>	
 	</rule>
@@ -104,19 +104,19 @@
 		<priority>3</priority>
 		
 		<properties>
-        	<property name="maxfields" value="15"/>
+        	<property name="maxfields" value="20"/>
         	
         	<!-- relevant for Code Climate output only -->
         	<property name="cc_categories" value="Complexity"/>
-        	<property name="cc_remediation_points_multiplier" value="100"/>
+        	<property name="cc_remediation_points_multiplier" value="200"/>
         	<property name="cc_block_highlighting" value="false"/>
     	</properties>	
 	</rule>
 	
-	<rule ref="rulesets/apex/complexity.xml/AvoidDeeplyNestedIfStmts" message="Deeply nested if..then statements are hard to read">
+	<rule ref="rulesets/apex/complexity.xml/AvoidDeeplyNestedIfStmts" message="Deeply nested if..else statements are hard to read">
 		<priority>3</priority>
 		<properties>
-        	<property name="problemDepth" value="3"/>
+        	<property name="problemDepth" value="4"/>
         	
         	<!-- relevant for Code Climate output only -->
         	<property name="cc_categories" value="Complexity"/>
@@ -131,7 +131,7 @@
         <properties>	
 	       	<!-- relevant for Code Climate output only -->
 	       	<property name="cc_categories" value="Performance"/>
-	       	<property name="cc_remediation_points_multiplier" value="300"/>
+	       	<property name="cc_remediation_points_multiplier" value="150"/>
         	<property name="cc_block_highlighting" value="false"/>
        	</properties>
 	</rule>
@@ -142,7 +142,7 @@
         <properties>	
 	       	<!-- relevant for Code Climate output only -->
 	       	<property name="cc_categories" value="Style"/>
-	       	<property name="cc_remediation_points_multiplier" value="300"/>
+	       	<property name="cc_remediation_points_multiplier" value="200"/>
         	<property name="cc_block_highlighting" value="false"/>
        	</properties>
 	</rule>
@@ -164,7 +164,7 @@
         <properties>	
 	       	<!-- relevant for Code Climate output only -->
 	       	<property name="cc_categories" value="Style"/>
-	       	<property name="cc_remediation_points_multiplier" value="1"/>
+	       	<property name="cc_remediation_points_multiplier" value="5"/>
         	<property name="cc_block_highlighting" value="false"/>
        	</properties>
 	</rule>
@@ -187,7 +187,7 @@
         <properties>	
 	       	<!-- relevant for Code Climate output only -->
 	       	<property name="cc_categories" value="Style"/>
-	       	<property name="cc_remediation_points_multiplier" value="5"/>
+	       	<property name="cc_remediation_points_multiplier" value="50"/>
         	<property name="cc_block_highlighting" value="false"/>
        	</properties>
 	</rule>
@@ -198,9 +198,9 @@
         <properties>	
 	       	<!-- relevant for Code Climate output only -->
 	       	<property name="cc_categories" value="Style"/>
-	       	<property name="cc_remediation_points_multiplier" value="1"/>
+	       	<property name="cc_remediation_points_multiplier" value="5"/>
         	<property name="cc_block_highlighting" value="false"/>
        	</properties>
 	</rule>
 	
-</ruleset>
\ No newline at end of file
+</ruleset>