diff --git a/.gitmodules b/.gitmodules
index 28a38913ff8..b37b24cf6d9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
+[submodule "src/main/resources/csl-styles"]
+	path = src/main/resources/csl-styles
+	url = https://github.com/citation-style-language/styles.git
 [submodule "src/main/resources/csl-locales"]
 	path = src/main/resources/csl-locales
 	url = https://github.com/citation-style-language/locales.git
diff --git a/eclipse.gradle b/eclipse.gradle
index 8f3aaa17d00..6fa381b3fe7 100644
--- a/eclipse.gradle
+++ b/eclipse.gradle
@@ -11,39 +11,17 @@ eclipseJdt.doLast {
     f.append('encoding/<project>=UTF-8')
 }
 eclipse {
-    project {
-        natures 'org.eclipse.buildship.core.gradleprojectnature'
-    }
-
-    classpath {
+//add libraries to module path: https://github.com/eclipse/buildship/issues/620#issuecomment-390469550
+ classpath {
         file {
             whenMerged {
-                entries.findAll { isModule(it) }.each { //(1)
-                    it.entryAttributes['module'] = 'true'
-                }
-
-                entries.findAll { isSource(it) && isTestScope(it) }.each {
-                    it.entryAttributes['test'] = 'true'
-                }
-
-                entries.findAll { isLibrary(it) && isTestScope(it) }.each {
-                    it.entryAttributes['test'] = 'true'
-                }
+                entries.findAll {
+                    it.kind == 'src' || it.kind == 'lib'
+                }.each { it.entryAttributes['module'] = 'true' }
             }
         }
-
-        defaultOutputDir = file('build')
-        downloadSources = true
-        downloadJavadoc = true
     }
 }
-
-boolean isLibrary(entry) { return entry.properties.kind.equals('lib') }
-boolean isTestScope(entry) { return entry.entryAttributes.get('gradle_used_by_scope').equals('test'); }
-boolean isModule(entry) { isLibrary(entry) && !isTestScope(entry); }
-boolean isSource(entry) { return entry.properties.kind.equals('src'); }
-
-
 // add formatter and cleanup settings to Eclipse settings
 // see http://stackoverflow.com/a/27461890/873282
 
diff --git a/src/main/java/org/jabref/JabRefMain.java b/src/main/java/org/jabref/JabRefMain.java
index 93a16422b46..72051540247 100644
--- a/src/main/java/org/jabref/JabRefMain.java
+++ b/src/main/java/org/jabref/JabRefMain.java
@@ -48,7 +48,7 @@ public static void main(String[] args) {
     public void start(Stage mainStage) throws Exception {
         try {
             // Fail on unsupported Java versions
-           // ensureCorrectJavaVersion();
+            ensureCorrectJavaVersion();
             FallbackExceptionHandler.installExceptionHandler();
 
             // Init preferences
diff --git a/src/main/resources/csl-locales b/src/main/resources/csl-locales
index 29ed2ff4328..e89e6b08b5c 160000
--- a/src/main/resources/csl-locales
+++ b/src/main/resources/csl-locales
@@ -1 +1 @@
-Subproject commit 29ed2ff43284f726f9f583981650a86ffb9b236f
+Subproject commit e89e6b08b5c621a414fc7114f2129efac5f8c7d5
diff --git a/src/main/resources/csl-styles b/src/main/resources/csl-styles
new file mode 160000
index 00000000000..fa125ec03c6
--- /dev/null
+++ b/src/main/resources/csl-styles
@@ -0,0 +1 @@
+Subproject commit fa125ec03c6270dea5881ec1623f1b741da6e759