diff --git a/client/pom.xml b/client/pom.xml
index ed9d495..6c4a418 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -11,6 +11,10 @@
 	<artifactId>lingo-websocket-client</artifactId>
 	<name>Lingo WebSocket :: Client</name>
 
+	<properties>
+		<javafx.version>11.0.2</javafx.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -23,6 +27,23 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-websocket</artifactId>
 		</dependency>
+
+		<!-- JavaFX -->
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-controls</artifactId>
+			<version>${javafx.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-fxml</artifactId>
+			<version>${javafx.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-web</artifactId>
+			<version>${javafx.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/client/src/main/java/lingo/client/bootstrap/LingoClient.java b/client/src/main/java/lingo/client/bootstrap/LingoClient.java
index f3e9459..4abc24c 100644
--- a/client/src/main/java/lingo/client/bootstrap/LingoClient.java
+++ b/client/src/main/java/lingo/client/bootstrap/LingoClient.java
@@ -4,6 +4,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -29,7 +30,7 @@ public class LingoClient extends Application {
 	public void init() throws Exception {
 		ConfigurableApplicationContext context = startSpringApplication();
 		FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/Lingo.fxml"));
-		loader.setControllerFactory(clazz -> context.getBean(clazz));
+		loader.setControllerFactory(context::getBean);
 		root = loader.load();
 	}
 
@@ -51,9 +52,9 @@ public class LingoClient extends Application {
 
 	private ConfigurableApplicationContext startSpringApplication() {
 		SpringApplication application = new SpringApplication(LingoClient.class);
-		String[] args = getParameters().getRaw().stream().toArray(String[]::new);
+		String[] args = getParameters().getRaw().toArray(new String[0]);
 		application.setHeadless(false);
-		application.setWebEnvironment(false);
+		application.setWebApplicationType(WebApplicationType.NONE);
 		return application.run(args);
 	}
 
diff --git a/client/src/main/java/lingo/client/bootstrap/LingoPresenter.java b/client/src/main/java/lingo/client/bootstrap/LingoPresenter.java
index 8025f47..538af79 100644
--- a/client/src/main/java/lingo/client/bootstrap/LingoPresenter.java
+++ b/client/src/main/java/lingo/client/bootstrap/LingoPresenter.java
@@ -71,7 +71,7 @@ public class LingoPresenter implements FxmlController {
 
 			Platform.runLater(() -> {
 				FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/LingoMultiplayer.fxml"));
-				loader.setControllerFactory(clazz -> multiplayerContext.getBean(clazz));
+				loader.setControllerFactory(multiplayerContext::getBean);
 				try {
 					content.setCenter(loader.load());
 				} catch (IOException e) {
diff --git a/common/pom.xml b/common/pom.xml
index adae62f..ecf01d2 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.3.2</version>
+			<version>3.8.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/pom.xml b/pom.xml
index d241d47..d01269a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
+		<version>2.1.2.RELEASE</version>
 	</parent>
 
 	<groupId>com.charego</groupId>
diff --git a/server/src/main/java/lingo/server/WebSocketConfig.java b/server/src/main/java/lingo/server/WebSocketConfig.java
index 5206b7c..e259069 100644
--- a/server/src/main/java/lingo/server/WebSocketConfig.java
+++ b/server/src/main/java/lingo/server/WebSocketConfig.java
@@ -5,13 +5,13 @@ import org.springframework.messaging.simp.config.ChannelRegistration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
 
 @Configuration
 @EnableWebSocketMessageBroker
-public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
 	@Override
 	public void configureClientInboundChannel(ChannelRegistration registration) {