diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java
index 90d9df8f322498968c13d61d962f3898b197fb1b..3c43cca588470edbbd0f989788a8366e11cbb329 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java
@@ -74,17 +74,14 @@ public class ColorAdjuster {
 		Color layoutStdColor = globalDesign.getDesignDefaultColor();
 		Color layoutEvColor = globalDesign.getDesignEventColor();
 
-		if(pad != null)
-		{
+		if (pad != null) {
 			final ModernCartDesign padDesign = pad.getPadSettings().getDesign();
 
-			if(padDesign.isEnableCustomBackgroundColor())
-			{
+			if (padDesign.isEnableCustomBackgroundColor()) {
 				layoutStdColor = padDesign.getDesignDefaultColor();
 			}
 
-			if(padDesign.isEnableCustomPlayColor())
-			{
+			if (padDesign.isEnableCustomPlayColor()) {
 				layoutEvColor = padDesign.getDesignEventColor();
 			}
 		}
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignProvider.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignProvider.java
index 08c41f82f6ebaf0f30c044fede65d5d616f877e4..6b374d257db4b5dc8b09ef944bc0ad9d98eaf0fd 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignProvider.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignProvider.java
@@ -4,8 +4,8 @@ import de.tobias.playpad.design.modern.ModernCartDesignHandler;
 import de.tobias.playpad.design.modern.ModernGlobalDesignHandler;
 import de.tobias.playpad.design.modern.ModernWarningDesignHandler;
 
-public interface ModernDesignProvider
-{
+public interface ModernDesignProvider {
+
 	ModernWarningDesignHandler warning();
 
 	ModernGlobalDesignHandler global();
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernCartDesignHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernCartDesignHandler.java
index 7f7afe2d3b7fcf1e2ab6687e2539ea71200949e0..f456ca512fd0dc06d505a13ca0fa071d0be113ee 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernCartDesignHandler.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernCartDesignHandler.java
@@ -2,7 +2,6 @@ package de.tobias.playpad.design.modern;
 
 import de.tobias.playpad.design.modern.model.ModernCartDesign;
 
-public interface ModernCartDesignHandler
-{
+public interface ModernCartDesignHandler {
 	String generateCss(ModernCartDesign design, String classSuffix, boolean flat);
 }
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesignHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesignHandler.java
index 826e3409a7e0ea7170b9598f563e995d4ac4f158..bd7e9348e4b1b92315b9c094e19968e360a46835 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesignHandler.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesignHandler.java
@@ -5,8 +5,7 @@ import de.tobias.playpad.project.Project;
 import de.tobias.playpad.viewcontroller.main.IMainViewController;
 import javafx.stage.Stage;
 
-public interface ModernGlobalDesignHandler
-{
+public interface ModernGlobalDesignHandler {
 
 	void applyStyleSheet(Stage stage);
 
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernWarningDesignHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernWarningDesignHandler.java
index f365d2311a6f0cc8c09cf6d8d18391e8fc09f0c8..aeed4d5a8545b740424eb8db62df65e6a85a8774 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernWarningDesignHandler.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernWarningDesignHandler.java
@@ -8,20 +8,17 @@ import de.tobias.playpad.pad.viewcontroller.AbstractPadViewController;
 import de.tobias.playpad.util.FadeableColor;
 import javafx.util.Duration;
 
-public interface ModernWarningDesignHandler
-{
-	default void handleWarning(ModernGlobalDesign globalDesign, ModernCartDesign cartDesign, AbstractPadViewController controller, Duration warningDuration)
-	{
+public interface ModernWarningDesignHandler {
+
+	default void handleWarning(ModernGlobalDesign globalDesign, ModernCartDesign cartDesign, AbstractPadViewController controller, Duration warningDuration) {
 		ModernColor backgroundColor = globalDesign.getBackgroundColor();
 		ModernColor playColor = globalDesign.getPlayColor();
 
-		if(cartDesign.isEnableCustomBackgroundColor())
-		{
+		if (cartDesign.isEnableCustomBackgroundColor()) {
 			backgroundColor = cartDesign.getBackgroundColor();
 		}
 
-		if(cartDesign.isEnableCustomPlayColor())
-		{
+		if (cartDesign.isEnableCustomPlayColor()) {
 			playColor = cartDesign.getPlayColor();
 		}
 
@@ -32,13 +29,10 @@ public interface ModernWarningDesignHandler
 		performWarning(globalDesign, fadeStartColor, fadeStopColor, controller, duration);
 	}
 
-	default Duration determineDuration(Pad pad, Duration warningDuration)
-	{
-		if(pad.getContent() instanceof Durationable)
-		{
+	default Duration determineDuration(Pad pad, Duration warningDuration) {
+		if (pad.getContent() instanceof Durationable) {
 			final Durationable durationable = (Durationable) pad.getContent();
-			if(warningDuration.greaterThan(durationable.getDuration()))
-			{
+			if (warningDuration.greaterThan(durationable.getDuration())) {
 				return durationable.getDuration();
 			}
 		}
@@ -51,7 +45,6 @@ public interface ModernWarningDesignHandler
 	 */
 	void performWarning(ModernGlobalDesign design, FadeableColor fadeStartColor, FadeableColor fadeStopColor, AbstractPadViewController controller, Duration duration);
 
-	default void stopWarning(AbstractPadViewController controller)
-	{
+	default void stopWarning(AbstractPadViewController controller) {
 	}
 }
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/model/ModernCartDesign.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/model/ModernCartDesign.java
index d69ac256e6bf02208c0d151a48b68d6cbb69720d..0997d291bb879d0820829479946966374827d659 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/model/ModernCartDesign.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/model/ModernCartDesign.java
@@ -15,9 +15,10 @@ import javafx.scene.paint.Color;
 import java.util.UUID;
 
 public class ModernCartDesign implements FeedbackDesignColorSuggester {
+
 	public static class ModernCartDesignBuilder {
 		private final Pad pad;
-		private	final UUID id;
+		private final UUID id;
 
 		private ModernColor backgroundColor = DEFAULT_COLOR_BACKGROUND;
 		private Boolean enableCustomBackgroundColor = false;
@@ -30,7 +31,7 @@ public class ModernCartDesign implements FeedbackDesignColorSuggester {
 
 		public ModernCartDesignBuilder(Pad pad) {
 			this.pad = pad;
-			this.id =UUID.randomUUID();
+			this.id = UUID.randomUUID();
 		}
 
 		public ModernCartDesignBuilder(Pad pad, UUID id) {
@@ -68,7 +69,8 @@ public class ModernCartDesign implements FeedbackDesignColorSuggester {
 	public static final ModernColor DEFAULT_COLOR_PLAY = ModernColor.RED3;
 	public static final ModernColor DEFAULT_COLOR_CUE_IN = ModernColor.RED2;
 
-	private UUID uuid;
+	private final Pad pad;
+	private final UUID uuid;
 
 	private BooleanProperty enableCustomBackgroundColor;
 	private ObjectProperty<ModernColor> backgroundColor;
@@ -79,13 +81,12 @@ public class ModernCartDesign implements FeedbackDesignColorSuggester {
 	private BooleanProperty enableCustomCueInColor;
 	private ObjectProperty<ModernColor> cueInColor;
 
-	private Pad pad;
 	private DesignUpdateListener syncListener;
 
 	private ModernCartDesign(Pad pad, UUID id,
-							ModernColor backgroundColor, Boolean enableCustomBackgroundColor,
-							ModernColor playColor, Boolean enableCustomPlayColor,
-							ModernColor cueInColor, Boolean enableCustomCueInColor) {
+							 ModernColor backgroundColor, Boolean enableCustomBackgroundColor,
+							 ModernColor playColor, Boolean enableCustomPlayColor,
+							 ModernColor cueInColor, Boolean enableCustomCueInColor) {
 		this.uuid = id;
 		this.pad = pad;
 
@@ -109,18 +110,15 @@ public class ModernCartDesign implements FeedbackDesignColorSuggester {
 		return pad;
 	}
 
-	public boolean isEnableCustomBackgroundColor()
-	{
+	public boolean isEnableCustomBackgroundColor() {
 		return enableCustomBackgroundColor.get();
 	}
 
-	public void setEnableCustomBackgroundColor(Boolean enableCustomBackgroundColor)
-	{
+	public void setEnableCustomBackgroundColor(Boolean enableCustomBackgroundColor) {
 		this.enableCustomBackgroundColor.set(enableCustomBackgroundColor);
 	}
 
-	public BooleanProperty enableCustomBackgroundColorProperty()
-	{
+	public BooleanProperty enableCustomBackgroundColorProperty() {
 		return enableCustomBackgroundColor;
 	}
 
@@ -136,18 +134,15 @@ public class ModernCartDesign implements FeedbackDesignColorSuggester {
 		return backgroundColor;
 	}
 
-	public boolean isEnableCustomPlayColor()
-	{
+	public boolean isEnableCustomPlayColor() {
 		return enableCustomPlayColor.get();
 	}
 
-	public void setEnableCustomPlayColor(boolean enableCustomPlayColor)
-	{
+	public void setEnableCustomPlayColor(boolean enableCustomPlayColor) {
 		this.enableCustomPlayColor.set(enableCustomPlayColor);
 	}
 
-	public BooleanProperty enableCustomPlayColorProperty()
-	{
+	public BooleanProperty enableCustomPlayColorProperty() {
 		return enableCustomPlayColor;
 	}
 
@@ -163,18 +158,15 @@ public class ModernCartDesign implements FeedbackDesignColorSuggester {
 		return playColor;
 	}
 
-	public boolean isEnableCustomCueInColor()
-	{
+	public boolean isEnableCustomCueInColor() {
 		return enableCustomCueInColor.get();
 	}
 
-	public void setEnableCustomCueInColor(boolean enableCustomCueInColor)
-	{
+	public void setEnableCustomCueInColor(boolean enableCustomCueInColor) {
 		this.enableCustomCueInColor.set(enableCustomCueInColor);
 	}
 
-	public BooleanProperty enableCustomCueInColorProperty()
-	{
+	public BooleanProperty enableCustomCueInColorProperty() {
 		return enableCustomCueInColor;
 	}
 
@@ -204,7 +196,7 @@ public class ModernCartDesign implements FeedbackDesignColorSuggester {
 		cueInColor.set(DEFAULT_COLOR_CUE_IN);
 	}
 
-	// Color Associator
+	// Color Associate
 	@Override
 	public Color getDesignEventColor() {
 		return Color.web(playColor.get().getColorHi());
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/pad/PadSettings.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/PadSettings.java
index 8e8e3faf88ad68c8f82dfddfb11c7b1b32ac1454..f857d09438102ceae8e7cab8105be25c29a49591 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/pad/PadSettings.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/PadSettings.java
@@ -291,8 +291,7 @@ public class PadSettings {
 	//// Computed
 
 	public ModernColor getBackgroundColor() {
-		if(design.isEnableCustomBackgroundColor())
-		{
+		if (design.isEnableCustomBackgroundColor()) {
 			return design.getBackgroundColor();
 		}
 
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/PadContentPlaylistFactory.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/PadContentPlaylistFactory.java
index 80ae9cc692966db632d8c11bc55b49f7de855ece..67d90ac300a467168926e76e95342e7730d3eb8a 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/PadContentPlaylistFactory.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/PadContentPlaylistFactory.java
@@ -4,7 +4,7 @@ import de.tobias.playpad.pad.Pad;
 import de.tobias.playpad.pad.mediapath.MediaPath;
 import javafx.scene.Node;
 
-public interface PadContentPlaylistFactory
-{
+public interface PadContentPlaylistFactory {
+
 	Node getCustomPlaylistItemView(Pad pad, MediaPath mediaPath);
 }
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/listener/PadFadeDurationListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/listener/PadFadeDurationListener.java
index 214f832d81b61a8449170e5443a83a1fa32c57de..5aac293cf6f31ab2c25a852fd274a90a8c696fda 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/listener/PadFadeDurationListener.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/listener/PadFadeDurationListener.java
@@ -30,7 +30,7 @@ public class PadFadeDurationListener implements ChangeListener<Duration> {
 			if (pad.getContent() instanceof Playlistable && ((Playlistable) pad.getContent()).hasNext()) {
 				return;
 			}
-			
+
 			if (pad.getContent() instanceof Durationable) {
 				final Durationable durationable = (Durationable) pad.getContent();
 
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/trigger/PadTriggerStatusListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/trigger/PadTriggerStatusListener.java
index 5f28296ac7c24a72a9ae24fc40c1305b6eb4e3df..c3a7239722ac9e9e93e6aba3d5b0b8f9bc27645d 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/trigger/PadTriggerStatusListener.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/trigger/PadTriggerStatusListener.java
@@ -30,7 +30,7 @@ public class PadTriggerStatusListener implements ChangeListener<PadStatus> {
 				executeTrigger(padSettings.getTriggers().get(TriggerPoint.START));
 			} else if (newValue == PadStatus.STOP && !pad.isEof()) {
 				executeTrigger(padSettings.getTriggers().get(TriggerPoint.STOP));
-			} else if (oldState == PadStatus.STOP && newValue == PadStatus.READY && pad.isEof()){
+			} else if (oldState == PadStatus.STOP && newValue == PadStatus.READY && pad.isEof()) {
 				executeTrigger(padSettings.getTriggers().get(TriggerPoint.EOF));
 			}
 		} else {
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/plugin/Jni4NetBridgeInitializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/Jni4NetBridgeInitializer.java
index 70ef43d42df040669e4daaf7fd413789b000c557..fec2d6c9b019227def912bd336e34277ff8a5231 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/plugin/Jni4NetBridgeInitializer.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/Jni4NetBridgeInitializer.java
@@ -15,48 +15,48 @@ import java.util.Objects;
 
 public class Jni4NetBridgeInitializer {
 
-    private static final String[] RESOURCE_DLLS = {
-            "jni4net.n-0.8.8.0.dll",
-            "jni4net.n.w32.v40-0.8.8.0.dll",
-            "jni4net.n.w64.v40-0.8.8.0.dll",
-    };
-
-    private static boolean loaded;
-
-    public static void initialize() throws IOException {
-        if (loaded) {
-            return;
-        }
-
-        final App app = ApplicationUtils.getApplication();
-        Path resourceFolder = copyResources("j4n/",RESOURCE_DLLS, "j4n", Jni4NetBridgeInitializer.class.getClassLoader());
-
-        Bridge.setVerbose(app.isDebug());
-        Bridge.init(resourceFolder.toFile());
-        loaded = true;
-    }
-
-    public static void loadDll(ClassLoader classLoader, String classpathDirectory, String target, String proxyDll, String... resources) throws IOException {
-        Path resourceFolder = copyResources(classpathDirectory, resources, target, classLoader);
-        Bridge.LoadAndRegisterAssemblyFrom(resourceFolder.resolve(proxyDll).toFile(), classLoader);
-    }
-
-    private static Path copyResources(String classpathDirectory, String[] resources, String destination, ClassLoader classLoader) throws IOException {
-        final App app = ApplicationUtils.getApplication();
-        final Path resourceFolder = app.getPath(PathType.LIBRARY, destination);
-
-        if (Files.notExists(resourceFolder)) {
-            Files.createDirectories(resourceFolder);
-        }
-
-        Arrays.stream(resources).forEach(resource -> {
-            final Path dest = resourceFolder.resolve(resource);
-            try {
-                Files.copy(Objects.requireNonNull(classLoader.getResourceAsStream(classpathDirectory + resource)), dest, StandardCopyOption.REPLACE_EXISTING);
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
-        });
-        return resourceFolder;
-    }
+	private static final String[] RESOURCE_DLLS = {
+			"jni4net.n-0.8.8.0.dll",
+			"jni4net.n.w32.v40-0.8.8.0.dll",
+			"jni4net.n.w64.v40-0.8.8.0.dll",
+	};
+
+	private static boolean loaded;
+
+	public static void initialize() throws IOException {
+		if (loaded) {
+			return;
+		}
+
+		final App app = ApplicationUtils.getApplication();
+		Path resourceFolder = copyResources("j4n/", RESOURCE_DLLS, "j4n", Jni4NetBridgeInitializer.class.getClassLoader());
+
+		Bridge.setVerbose(app.isDebug());
+		Bridge.init(resourceFolder.toFile());
+		loaded = true;
+	}
+
+	public static void loadDll(ClassLoader classLoader, String classpathDirectory, String target, String proxyDll, String... resources) throws IOException {
+		Path resourceFolder = copyResources(classpathDirectory, resources, target, classLoader);
+		Bridge.LoadAndRegisterAssemblyFrom(resourceFolder.resolve(proxyDll).toFile(), classLoader);
+	}
+
+	private static Path copyResources(String classpathDirectory, String[] resources, String destination, ClassLoader classLoader) throws IOException {
+		final App app = ApplicationUtils.getApplication();
+		final Path resourceFolder = app.getPath(PathType.LIBRARY, destination);
+
+		if (Files.notExists(resourceFolder)) {
+			Files.createDirectories(resourceFolder);
+		}
+
+		Arrays.stream(resources).forEach(resource -> {
+			final Path dest = resourceFolder.resolve(resource);
+			try {
+				Files.copy(Objects.requireNonNull(classLoader.getResourceAsStream(classpathDirectory + resource)), dest, StandardCopyOption.REPLACE_EXISTING);
+			} catch (IOException e) {
+				throw new UncheckedIOException(e);
+			}
+		});
+		return resourceFolder;
+	}
 }
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSettings.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSettings.java
index 5681a250bc37d717584a425ab31cb9920ad6b811..3752ac7216f80a8d5177323af98b2e88617285fb 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSettings.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSettings.java
@@ -13,11 +13,9 @@ public class ProjectSettings implements IProjectSettings {
 
 	static {
 		final UserDefaults userDefaults = ApplicationUtils.getApplication().getUserDefaults();
-		if(userDefaults != null)
-		{
+		if (userDefaults != null) {
 			Object maxPages = userDefaults.getData("MAX_PAGES");
-			if(maxPages != null)
-			{
+			if (maxPages != null) {
 				MAX_PAGES = Integer.parseInt(maxPages.toString());
 			}
 		}
diff --git a/PlayWallCore/src/test/java/de/tobias/playpad/design/modern/serializer/ModernCartDesignSerializerTest.java b/PlayWallCore/src/test/java/de/tobias/playpad/design/modern/serializer/ModernCartDesignSerializerTest.java
index 07af888da77a569ae027fe923a32ae5c5b432990..a9d45ba434dc424b0be1f71e1c0f24cfe7492244 100644
--- a/PlayWallCore/src/test/java/de/tobias/playpad/design/modern/serializer/ModernCartDesignSerializerTest.java
+++ b/PlayWallCore/src/test/java/de/tobias/playpad/design/modern/serializer/ModernCartDesignSerializerTest.java
@@ -14,8 +14,7 @@ import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ModernCartDesignSerializerTest
-{
+public class ModernCartDesignSerializerTest {
 	private final ModernColor BACKGROUND_COLOR = ModernColor.BLUE1;
 	private final ModernColor PLAY_COLOR = ModernColor.GRAY5;
 	private final ModernColor CUE_IN_COLOR = ModernColor.PURPLE1;
@@ -24,8 +23,7 @@ public class ModernCartDesignSerializerTest
 
 
 	@Test
-	public void testSave()
-	{
+	public void testSave() {
 		// arrange
 		final ModernCartDesign design = new ModernCartDesign.ModernCartDesignBuilder(null, DESIGN_UUID)
 				.withBackgroundColor(BACKGROUND_COLOR, true)
@@ -54,8 +52,7 @@ public class ModernCartDesignSerializerTest
 	}
 
 	@Test
-	public void testLoad() throws DocumentException
-	{
+	public void testLoad() throws DocumentException {
 		// arrange
 		final String filePath = "de/tobias/playpad/design/modern/serializer/modern_cart_design.xml";
 		final InputStream inputStream = ModernCartDesignSerializerTest.class.getClassLoader().getResourceAsStream(filePath);
diff --git a/PlayWallCore/src/test/java/de/tobias/playpad/design/modern/serializer/ModernGlobalDesignSerializerTest.java b/PlayWallCore/src/test/java/de/tobias/playpad/design/modern/serializer/ModernGlobalDesignSerializerTest.java
index 2ef911d309146f0e69a154451026df4950967c41..aa6ed525ff513e47619b066e52f5772edbc27a32 100644
--- a/PlayWallCore/src/test/java/de/tobias/playpad/design/modern/serializer/ModernGlobalDesignSerializerTest.java
+++ b/PlayWallCore/src/test/java/de/tobias/playpad/design/modern/serializer/ModernGlobalDesignSerializerTest.java
@@ -13,8 +13,7 @@ import java.io.InputStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ModernGlobalDesignSerializerTest
-{
+public class ModernGlobalDesignSerializerTest {
 	private final ModernColor BACKGROUND_COLOR = ModernColor.BLUE1;
 	private final ModernColor PLAY_COLOR = ModernColor.GRAY5;
 	private final ModernColor CUE_IN_COLOR = ModernColor.PURPLE1;
@@ -22,8 +21,7 @@ public class ModernGlobalDesignSerializerTest
 	private final int TITLE_FONT_SIZE = 18;
 
 	@Test
-	public void testSave()
-	{
+	public void testSave() {
 		// arrange
 		final ModernGlobalDesign design = new ModernGlobalDesign();
 		design.setFlatDesign(true);
@@ -52,8 +50,7 @@ public class ModernGlobalDesignSerializerTest
 	}
 
 	@Test
-	public void testLoad() throws DocumentException
-	{
+	public void testLoad() throws DocumentException {
 		// arrange
 		final String filePath = "de/tobias/playpad/design/modern/serializer/modern_global_design.xml";
 		final InputStream inputStream = ModernGlobalDesignSerializerTest.class.getClassLoader().getResourceAsStream(filePath);
diff --git a/PlayWallCore/src/test/java/de/tobias/playpad/pad/PadSettingsSerializerTest.java b/PlayWallCore/src/test/java/de/tobias/playpad/pad/PadSettingsSerializerTest.java
index 369375155b1d6d5a7fc4cf260324579c97b6aec2..b7f994051511b68bb1ee5063d1cccd8aae2953f1 100644
--- a/PlayWallCore/src/test/java/de/tobias/playpad/pad/PadSettingsSerializerTest.java
+++ b/PlayWallCore/src/test/java/de/tobias/playpad/pad/PadSettingsSerializerTest.java
@@ -14,11 +14,9 @@ import java.util.UUID;
 import static de.tobias.playpad.pad.PadSerializer.SETTINGS_ELEMENT;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class PadSettingsSerializerTest
-{
+public class PadSettingsSerializerTest {
 	@Test
-	public void testSave_General()
-	{
+	public void testSave_General() {
 		// arrange
 		final Document document = DocumentHelper.createDocument();
 		final Element rootElement = document.addElement(SETTINGS_ELEMENT);