diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3ac1090..a607f44 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="75ef5724-93bc-4ed4-82b2-ff12411188dc" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.travis.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.travis.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/richedit/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gumtree/client.diff/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/client.diff/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gumtree/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/pom.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -66,11 +65,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/gumtree/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="412">
-              <caret line="164" column="21" selection-start-line="107" selection-start-column="12" selection-end-line="164" selection-end-column="21" />
+            <state relative-caret-position="247">
+              <caret line="77" column="15" selection-start-line="77" selection-start-column="15" selection-end-line="77" selection-end-column="15" />
             </state>
           </provider>
         </entry>
@@ -96,11 +95,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/.travis.yml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="180">
-              <caret line="12" column="49" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="49" />
+              <caret line="12" column="29" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
             </state>
           </provider>
         </entry>
@@ -127,7 +126,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>richedit</find>
       <find>stopD</find>
       <find>'shapes'</find>
       <find>TestTreeUtils</find>
@@ -156,6 +154,8 @@
       <find>compareCFilesWithGumTree</find>
       <find>TestGumtreeMatcher</find>
       <find>project.build.sourceEncoding</find>
+      <find>com.puppycrawl.tools</find>
+      <find>com.sparkjava</find>
     </findStrings>
     <replaceStrings>
       <replace>fixminer</replace>
@@ -176,7 +176,6 @@
         <option value="$PROJECT_DIR$/src/main/java/edu/lu/uni/serval/richedit/Launcher.java" />
         <option value="$PROJECT_DIR$/gumtree/gen.jdt/pom.xml" />
         <option value="$PROJECT_DIR$/gumtree/core/pom.xml" />
-        <option value="$PROJECT_DIR$/gumtree/pom.xml" />
         <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/utils/FileHelper.java" />
         <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouper.java" />
         <option value="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffWorker.java" />
@@ -215,6 +214,8 @@
         <option value="$PROJECT_DIR$/richedit/pom.xml" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/.travis.yml" />
+        <option value="$PROJECT_DIR$/gumtree/pom.xml" />
+        <option value="$PROJECT_DIR$/gumtree/client.diff/pom.xml" />
       </list>
     </option>
   </component>
@@ -553,6 +554,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49315068" visible="true" weight="0.30708182" />
       <window_info id="Structure" order="1" sideWeight="0.5068493" side_tool="true" visible="true" weight="0.30708182" />
@@ -1130,13 +1132,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gumtree/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="412">
-          <caret line="164" column="21" selection-start-line="107" selection-start-column="12" selection-end-line="164" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/richedit/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="577">
@@ -1154,7 +1149,14 @@
     <entry file="file://$PROJECT_DIR$/.travis.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
-          <caret line="12" column="49" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="49" />
+          <caret line="12" column="29" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gumtree/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="77" column="15" selection-start-line="77" selection-start-column="15" selection-end-line="77" selection-end-column="15" />
         </state>
       </provider>
     </entry>
diff --git a/gumtree/client.diff/pom.xml b/gumtree/client.diff/pom.xml
index 800cfa9..3b23090 100644
--- a/gumtree/client.diff/pom.xml
+++ b/gumtree/client.diff/pom.xml
@@ -14,7 +14,7 @@
 		<dependency>
 		    <groupId>com.sparkjava</groupId>
 		    <artifactId>spark-core</artifactId>
-		    <version>2.6.0</version>
+		    <version>2.7.2</version>
 		</dependency>
     	
         <dependency>
diff --git a/gumtree/pom.xml b/gumtree/pom.xml
index 2ea4d89..cc4161f 100644
--- a/gumtree/pom.xml
+++ b/gumtree/pom.xml
@@ -74,7 +74,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>6.7</version>
+                        <version>8.29</version>
                     </dependency>
                 </dependencies>
                 <configuration>