diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index f67d8103e32a74af27ae80b5620f73cd4417f0f3..6079313daa28f3e42db537e8b0ae32f3af66f0bc 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
 #FindBugs User Preferences
-#Wed Apr 22 08:29:19 CEST 2015
+#Tue Apr 28 13:44:32 CEST 2015
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
diff --git a/conf/quality-config/pmd-ruleset.xml b/conf/quality-config/pmd-ruleset.xml
index d1ae4b3ea61acf2be754525db8135de799bc6cc7..4c922b9bb908e79042fd99cacb7a79367556c233 100644
--- a/conf/quality-config/pmd-ruleset.xml
+++ b/conf/quality-config/pmd-ruleset.xml
@@ -43,11 +43,11 @@
 	<rule ref="rulesets/jsp/basic-jsf.xml" />
 	<rule ref="rulesets/jsp/basic.xml" />
 
-	<rule ref="rulesets/vm/basic.xml" />
+<!-- 	<rule ref="rulesets/vm/basic.xml" /> -->
 
-	<rule ref="rulesets/xml/basic.xml" />
+<!-- 	<rule ref="rulesets/xml/basic.xml" /> -->
 
-	<rule ref="rulesets/xsl/xpath.xml" />
+<!-- 	<rule ref="rulesets/xsl/xpath.xml" /> -->
 
 	<!-- custom adaptations -->
 
@@ -80,6 +80,7 @@
 		<exclude name="LocalVariableCouldBeFinal" />
 		<exclude name="SimplifyStartsWith" />
 	</rule>
-
+	
+<!-- 	<rule ref="rulesets/chw/basic.xml" /> -->
 
 </ruleset>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 09b2dd7acd7cef9eca7737cf0e484a1a7410cfa6..6af5ac45ca865d4906e0680c1de965811fae3bfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,28 +208,28 @@
 			</plugin>
 
 			<!-- Checkstyle -->
-<!-- 			<plugin> -->
-<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
-<!-- 				<artifactId>maven-checkstyle-plugin</artifactId> -->
-<!-- 				<version>2.15</version> -->
-<!-- 				<executions> -->
-<!-- 					<execution> -->
-<!-- 						<phase>test</phase> -->
-<!-- 						<goals> -->
-<!-- 							<goal>check</goal> -->
-<!-- 						</goals> -->
-<!-- 						<configuration> -->
-<!-- 							<configLocation>${project.basedir}/conf/quality-config/cs-conf.xml</configLocation> -->
-<!-- 							<includeTestSourceDirectory>true</includeTestSourceDirectory> -->
-<!-- 							<encoding>UTF-8</encoding> -->
-<!-- 							<consoleOutput>true</consoleOutput> -->
-<!-- 							<failsOnError>false</failsOnError> -->
-<!-- 							<failOnViolation>false</failOnViolation> -->
-<!-- 							<linkXRef>false</linkXRef> -->
-<!-- 						</configuration> -->
-<!-- 					</execution> -->
-<!-- 				</executions> -->
-<!-- 			</plugin> -->
+			<!-- <plugin> -->
+			<!-- <groupId>org.apache.maven.plugins</groupId> -->
+			<!-- <artifactId>maven-checkstyle-plugin</artifactId> -->
+			<!-- <version>2.15</version> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <phase>test</phase> -->
+			<!-- <goals> -->
+			<!-- <goal>check</goal> -->
+			<!-- </goals> -->
+			<!-- <configuration> -->
+			<!-- <configLocation>${project.basedir}/conf/quality-config/cs-conf.xml</configLocation> -->
+			<!-- <includeTestSourceDirectory>true</includeTestSourceDirectory> -->
+			<!-- <encoding>UTF-8</encoding> -->
+			<!-- <consoleOutput>true</consoleOutput> -->
+			<!-- <failsOnError>false</failsOnError> -->
+			<!-- <failOnViolation>false</failOnViolation> -->
+			<!-- <linkXRef>false</linkXRef> -->
+			<!-- </configuration> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- </plugin> -->
 
 			<!-- Findbugs -->
 			<plugin>
@@ -258,7 +258,13 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-pmd-plugin</artifactId>
 				<version>3.4</version>
-
+				<dependencies>
+					<dependency>
+						<groupId>de.chw</groupId>
+						<artifactId>pmd.ruleset</artifactId>
+						<version>0.0.1-SNAPSHOT</version>
+					</dependency>
+				</dependencies>
 				<configuration>
 					<rulesets>
 						<ruleset>${project.basedir}/conf/quality-config/pmd-ruleset.xml</ruleset>
@@ -368,26 +374,26 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.3</version>
-				<configuration>
-					<destDir>${javadocOutputDir}</destDir>
-				</configuration>
-			</plugin>
+			<!-- Findbugs -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>findbugs-maven-plugin</artifactId>
 				<version>3.0.1</version>
 			</plugin>
-
+			<!-- PMD -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-pmd-plugin</artifactId>
 				<version>3.4</version>
 			</plugin>
-
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.3</version>
+				<configuration>
+					<destDir>${javadocOutputDir}</destDir>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>