diff --git a/.idea/modules.xml b/.idea/modules.xml
index eb35bf46..f631cdba 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,13 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/examples/x11.examples.main.iml" filepath="$PROJECT_DIR$/.idea/modules/examples/x11.examples.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/x11-client/x11.x11-client.integrationTest.iml" filepath="$PROJECT_DIR$/.idea/modules/x11-client/x11.x11-client.integrationTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/x11-client/x11.x11-client.main.iml" filepath="$PROJECT_DIR$/.idea/modules/x11-client/x11.x11-client.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/x11-client/x11.x11-client.test.iml" filepath="$PROJECT_DIR$/.idea/modules/x11-client/x11.x11-client.test.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/x11-protocol/x11.x11-protocol.main.iml" filepath="$PROJECT_DIR$/.idea/modules/x11-protocol/x11.x11-protocol.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/x11-toolkit/x11.x11-toolkit.main.iml" filepath="$PROJECT_DIR$/.idea/modules/x11-toolkit/x11.x11-toolkit.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/xephyr-runner/x11.xephyr-runner.main.iml" filepath="$PROJECT_DIR$/.idea/modules/xephyr-runner/x11.xephyr-runner.main.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/examples/x11.examples.main.iml b/.idea/modules/examples/x11.examples.main.iml
deleted file mode 100644
index 6ead6de8..00000000
--- a/.idea/modules/examples/x11.examples.main.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../../../examples/build/generated/sources/annotationProcessor/java/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../examples/build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
-    </content>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/x11-client/x11.x11-client.integrationTest.iml b/.idea/modules/x11-client/x11.x11-client.integrationTest.iml
index 9f050738..7ac7db03 100644
--- a/.idea/modules/x11-client/x11.x11-client.integrationTest.iml
+++ b/.idea/modules/x11-client/x11.x11-client.integrationTest.iml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
   <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../../../x11-client/build/generated/sources/annotationProcessor/java/integrationTest">
-      <sourceFolder url="file://$MODULE_DIR$/../../../x11-client/build/generated/sources/annotationProcessor/java/integrationTest" isTestSource="false" generated="true" />
-    </content>
     <content url="file://$MODULE_DIR$/../../../x11-client/src/integrationTest" dumb="true">
       <sourceFolder url="file://$MODULE_DIR$/../../../x11-client/src/integrationTest/java" isTestSource="false" />
     </content>
diff --git a/.idea/modules/x11-client/x11.x11-client.main.iml b/.idea/modules/x11-client/x11.x11-client.main.iml
deleted file mode 100644
index c63ff3fd..00000000
--- a/.idea/modules/x11-client/x11.x11-client.main.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../../../x11-client/build/generated/sources/annotationProcessor/java/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../x11-client/build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
-    </content>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/x11-client/x11.x11-client.test.iml b/.idea/modules/x11-client/x11.x11-client.test.iml
deleted file mode 100644
index b2a1ae0d..00000000
--- a/.idea/modules/x11-client/x11.x11-client.test.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../../../x11-client/build/generated/sources/annotationProcessor/java/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../x11-client/build/generated/sources/annotationProcessor/java/test" isTestSource="true" generated="true" />
-    </content>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/x11-protocol/x11.x11-protocol.main.iml b/.idea/modules/x11-protocol/x11.x11-protocol.main.iml
deleted file mode 100644
index 0a7d54b2..00000000
--- a/.idea/modules/x11-protocol/x11.x11-protocol.main.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../../../x11-protocol/build/generated/sources/annotationProcessor/java/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../x11-protocol/build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
-    </content>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/x11-toolkit/x11.x11-toolkit.main.iml b/.idea/modules/x11-toolkit/x11.x11-toolkit.main.iml
deleted file mode 100644
index c4d00f18..00000000
--- a/.idea/modules/x11-toolkit/x11.x11-toolkit.main.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../../../x11-toolkit/build/generated/sources/annotationProcessor/java/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../x11-toolkit/build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
-    </content>
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/xephyr-runner/x11.xephyr-runner.main.iml b/.idea/modules/xephyr-runner/x11.xephyr-runner.main.iml
deleted file mode 100644
index 5fca8a4d..00000000
--- a/.idea/modules/xephyr-runner/x11.xephyr-runner.main.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../../../xephyr-runner/build/generated/sources/annotationProcessor/java/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../xephyr-runner/build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
-    </content>
-  </component>
-</module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index bcde4496..4e0217bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,7 @@
 plugins {
   id 'org.sonarqube' version '4.4.1.3373'
+  id 'io.freefair.lombok' version '8.4' apply false
+  id 'org.unbroken-dome.test-sets' version '4.1.0' apply false
 }
 
 version = '0.15.0'
@@ -11,8 +13,6 @@ allprojects {
   }
 }
 
-
-
 sonar {
   properties {
     property "sonar.projectKey", "moaxcp_x11-client"
diff --git a/examples/build.gradle b/examples/build.gradle
index 9c52e847..8e51614f 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'io.freefair.lombok' version '8.4'
+    id 'io.freefair.lombok'
 }
 
 sonar {
diff --git a/x11-client/build.gradle b/x11-client/build.gradle
index 05a4a8bf..a0c7e203 100644
--- a/x11-client/build.gradle
+++ b/x11-client/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
-    id 'org.unbroken-dome.test-sets' version '4.1.0'
-    id 'io.freefair.lombok' version '8.4'
+    id 'org.unbroken-dome.test-sets'
+    id 'io.freefair.lombok'
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
diff --git a/x11-protocol/build.gradle b/x11-protocol/build.gradle
index 68c62ebd..5e4770c4 100644
--- a/x11-protocol/build.gradle
+++ b/x11-protocol/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'io.freefair.lombok' version '8.4'
+    id 'io.freefair.lombok'
     id 'com.github.moaxcp.x11protocol'
     id 'maven-publish'
     id 'signing'
diff --git a/x11-toolkit/build.gradle b/x11-toolkit/build.gradle
index b9909711..32812f71 100644
--- a/x11-toolkit/build.gradle
+++ b/x11-toolkit/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'io.freefair.lombok' version '8.4'
+    id 'io.freefair.lombok'
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
diff --git a/xephyr-runner/build.gradle b/xephyr-runner/build.gradle
index 6cd11487..29db7479 100644
--- a/xephyr-runner/build.gradle
+++ b/xephyr-runner/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'io.freefair.lombok' version '8.4'
+    id 'io.freefair.lombok'
     id 'maven-publish'
     id 'signing'
 }