diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 573656f6b552ab704fd9f1ad893286475dda5049..a39835be1296c75a848c5bd3a5488429a804a4b2 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -11,7 +11,6 @@
     <file url="file://$PROJECT_DIR$/PlayWallComponents/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/PlayWallCore" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/PlayWallCore/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/PlayWallCore/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/PlayWallPlugins" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginAwake" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginAwake/src/main/java" charset="UTF-8" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 18314e16a01630443dc2e35e13ab72d858e7f292..ca57f98e5686aa62d0af34128539b5e49bdf8acc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,20 +14,6 @@
   </component>
   <component name="JavadocGenerationManager">
     <option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/out/docs" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
     <option name="OPTION_INCLUDE_LIBS" value="true" />
   </component>
   <component name="MavenProjectsManager">
diff --git a/PlayWall/pom.xml b/PlayWall/pom.xml
index 128b269d4f0733b14704cd956f10572c1a3c1e80..ccb9aec7567cc8e913e7b5c597793d72e9e1183f 100644
--- a/PlayWall/pom.xml
+++ b/PlayWall/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallDesktop</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
 
     <artifactId>PlayWall</artifactId>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -209,7 +209,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.10</version>
+                <version>1.12</version>
                 <executions>
                     <execution>
                         <id>attach-artifacts</id>
@@ -273,19 +273,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -295,7 +295,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
diff --git a/PlayWall/src/main/java/de/tobias/playpad/Strings.java b/PlayWall/src/main/java/de/tobias/playpad/Strings.java
index b0dd8185e643922d87e0a59c4be70b0778a2cbb8..b28adcf21884f13366e14acc1b2f28b5a7ad0b00 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/Strings.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/Strings.java
@@ -232,10 +232,6 @@ public class Strings {
 	// TriggerPoint - Enum
 	public static final String TRIGGER_POINT = "TriggerPoint.";
 
-	// Main Layout
-	public static final String MAIN_LAYOUT_DESKTOP = "MainLayout.Desktop";
-	public static final String MAIN_LAYOUT_TOUCH = "MainLayout.Touch";
-
 	// Search
 	public static final String SEARCH_BUTTON = "Search.Button";
 	public static final String SEARCH_PLACEHOLDER = "Search.Placeholder";
diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index 6c5477e33d821002801d566770e8e6771e5f765e..fc6d030e7c7ca0032590d9df3395200e4f7c1371 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -82,6 +82,8 @@ import java.util.Optional;
 public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewController
 		implements EventHandler<ActionEvent>, ChangeListener<DesktopEditMode> {
 
+	private static final String LAYOUT_MENU_ITEM_IDENTIFIER = "layout-menu-item";
+
 	@FXML
 	private MenuBar menuBar;
 
@@ -230,6 +232,7 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
 	// Desktop Edit Mode Change Listener --> Update Button
 	@Override
 	public void changed(ObservableValue<? extends DesktopEditMode> observable, DesktopEditMode oldValue, DesktopEditMode newValue) {
+
 		// handle old mode
 		if (oldValue == DesktopEditMode.DRAG) {
 			for (IPadView view : mainViewController.getPadViews()) {
@@ -291,30 +294,37 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
 		mainViewController.getPadViews().forEach(i -> i.getViewController().updateButtonDisable());
 	}
 
-	private void initLayoutMenu() {
+	@Override
+	public void initLayoutMenu() {
 		ProfileSettings profileSettings = Profile.currentProfile().getProfileSettings();
 		Registry<MainLayoutFactory> mainLayouts = PlayPadPlugin.getRegistries().getMainLayouts();
 
+		layoutMenu.getItems().removeIf(item -> LAYOUT_MENU_ITEM_IDENTIFIER.equals(item.getUserData()));
+
 		int index = 1; // Für Tastenkombination
 		for (MainLayoutFactory connect : mainLayouts.getComponents()) {
-			if (!connect.getType().equals(profileSettings.getMainLayoutType())) {
-				MenuItem item = new MenuItem(connect.toString());
+			if(connect.getType().equals(profileSettings.getMainLayoutType()))
+			{
+				continue;
+			}
 
-				item.setOnAction(e ->
-				{
-					mainViewController.setMainLayout(connect);
-					Profile.currentProfile().getProfileSettings().setMainLayoutType(connect.getType());
-				});
+			MenuItem item = new MenuItem(connect.toString());
+			item.setUserData(LAYOUT_MENU_ITEM_IDENTIFIER);
 
-				// Key Combi
-				if (index < 10) {
-					item.setAccelerator(KeyCombination.keyCombination("Shortcut+" + index));
-				}
+			item.setOnAction(e ->
+			{
+				mainViewController.setMainLayout(connect);
+				Profile.currentProfile().getProfileSettings().setMainLayoutType(connect.getType());
+			});
 
-				layoutMenu.getItems().add(item);
-				index++;
+			// Key combination
+			if (index < 10) {
+				item.setAccelerator(KeyCombination.keyCombination("Shortcut+" + index));
 			}
-		}
+
+			layoutMenu.getItems().add(item);
+			index++;
+	}
 	}
 
 	@Override
diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
index 0ebc97bc89a32ff3bc2a1e7a4038b685970b1f4e..51f0e31995aa4d5ab5744a4fde399b749e1a73c0 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
@@ -156,4 +156,8 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
 		}
 	}
 
+	@Override
+	public void initLayoutMenu()
+	{
+	}
 }
\ No newline at end of file
diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
index dda1a0271b8ed060807765da15fc81f7850f2fb6..b2bf4ab78fee9e28884c81cd21fb457db7f1f677 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
@@ -597,6 +597,7 @@ public class MainViewController extends NVC implements IMainViewController, Noti
 
 		this.mainLayout = mainLayoutConnect;
 		initMainLayout();
+		this.menuToolbarViewController.initLayoutMenu();
 	}
 
 	/*
diff --git a/PlayWall/src/main/resources/repository.yml b/PlayWall/src/main/resources/repository.yml
index e510bbbe0a70acb18a2b526dce7e4c99d9afebcd..826913d6a55a055e639cc49a5322627074ad8573 100644
--- a/PlayWall/src/main/resources/repository.yml
+++ b/PlayWall/src/main/resources/repository.yml
@@ -1,4 +1,4 @@
-url: "https://maven.thecodedev.de/artifactory"
+url: "https://maven.thecodelabs.de/artifactory"
 repository:
   releases: "TheCodeLabs-release"
   snapshots: "TheCodeLabs-snapshots"
diff --git a/PlayWallComponents/pom.xml b/PlayWallComponents/pom.xml
index 8255854a4e9bcc1818325791480025f7c986899a..e43eab12219cb2353d7a74809fcba74d74097769 100644
--- a/PlayWallComponents/pom.xml
+++ b/PlayWallComponents/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallDesktop</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
 
     <artifactId>PlayWallComponents</artifactId>
@@ -52,19 +52,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/Releases</url>
+            <url>https://maven.thecodelabs.de/artifactory/Releases</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -74,7 +74,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
diff --git a/PlayWallCore/pom.xml b/PlayWallCore/pom.xml
index e67cab87688db9199336ac24c2ae2eeef1b95d4e..e2f7f2d2f67a8ed6af95a543b09d75d003aaec2c 100644
--- a/PlayWallCore/pom.xml
+++ b/PlayWallCore/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallDesktop</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
 
     <artifactId>PlayWallCore</artifactId>
@@ -140,19 +140,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -162,7 +162,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
index bc6a22572672b49a3332c397b36e3ab3e8d78095..a72fc0d36dd441a4fe9cd8304a2a3d560fd53483 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
@@ -164,4 +164,6 @@ public abstract class MenuToolbarViewController extends NVC {
 	 * @param project neues Project
 	 */
 	public abstract void setOpenProject(Project project);
+
+	public abstract void initLayoutMenu();
 }
diff --git a/PlayWallPlugins/PlayWallPluginAwake/pom.xml b/PlayWallPlugins/PlayWallPluginAwake/pom.xml
index 5877decd3dc885cfc77e87be3ad9ae596ce63eb7..e8e455aa952bf3696847c5cb239d45bd1817ecc4 100644
--- a/PlayWallPlugins/PlayWallPluginAwake/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginAwake/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallPlugins</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
 
     <artifactId>PlayWallPluginAwake</artifactId>
@@ -75,19 +75,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -97,7 +97,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
diff --git a/PlayWallPlugins/PlayWallPluginEqualizer/pom.xml b/PlayWallPlugins/PlayWallPluginEqualizer/pom.xml
index 4f67fc182ae2893f979afffcc19296166283c121..1256a10cbe09899239a41d8c2bc2fe2f6d3135a0 100644
--- a/PlayWallPlugins/PlayWallPluginEqualizer/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginEqualizer/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallPlugins</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
 
     <artifactId>PlayWallPluginEqualizer</artifactId>
@@ -75,19 +75,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -97,7 +97,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
diff --git a/PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml b/PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml
index e8d24dc204fab80c17cde8df8f82ae22b2080036..698c86e1e9d034551a033d3dc323d9baa21fcdd0 100644
--- a/PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallPlugins</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
 
     <artifactId>PlayWallPluginLaunchpad</artifactId>
@@ -74,19 +74,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -96,7 +96,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
diff --git a/PlayWallPlugins/PlayWallPluginMedia/pom.xml b/PlayWallPlugins/PlayWallPluginMedia/pom.xml
index 5db71d0179fb6d433f7bb42627bef71a365a7391..c28080c20e25e6f0b6f8fd0c6a0963c3a47891fa 100644
--- a/PlayWallPlugins/PlayWallPluginMedia/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginMedia/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallPlugins</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
 
     <artifactId>PlayWallPluginMedia</artifactId>
@@ -74,19 +74,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -96,7 +96,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
diff --git a/PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml b/PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml
index 78d54caccfbcec2d00e6bc409090b65fa972e0b5..8e54821dac703bc7ec4685f5dd50a199f56fb10a 100644
--- a/PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallPlugins</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
 
     <properties>
@@ -121,19 +121,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -143,7 +143,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml b/PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml
index ae398bce873e6a7a6837c752a9cd698c24b6a061..d03d7fa22d7222e5f75363e91ca9d6ae54ee068a 100644
--- a/PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallPlugins</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -114,19 +114,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -136,7 +136,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
diff --git a/PlayWallPlugins/PlayWallPluginWebAPI/pom.xml b/PlayWallPlugins/PlayWallPluginWebAPI/pom.xml
index ace41d618cabf45acf968da60772917c9da58002..85bc644f9a1801eb33e7e8b2ccee08592c3a1de8 100644
--- a/PlayWallPlugins/PlayWallPluginWebAPI/pom.xml
+++ b/PlayWallPlugins/PlayWallPluginWebAPI/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>PlayWallPlugins</artifactId>
         <groupId>de.tobias.playpad</groupId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -102,19 +102,19 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
     <repositories>
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -124,7 +124,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
diff --git a/PlayWallPlugins/pom.xml b/PlayWallPlugins/pom.xml
index 3245fcfb3328b8db5ba1b8301e1799d9cd4eaecd..e633d8b643444f5319297ee50360e08d1722198a 100644
--- a/PlayWallPlugins/pom.xml
+++ b/PlayWallPlugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.tobias.playpad</groupId>
         <artifactId>PlayWallDesktop</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 82079b9b1b8d764f64a83c4e47217801f3929a57..63cd9a604fd97a66cf02a4f4e51189b14aa14fb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.tobias.playpad</groupId>
     <artifactId>PlayWallDesktop</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -28,25 +28,25 @@
         <jlayer.version>1.0.1</jlayer.version>
 
         <itextpdf.version>5.5.13</itextpdf.version>
-        <jackson-dataformat-csv.version>2.9.9</jackson-dataformat-csv.version>
+        <jackson-dataformat-csv.version>2.11.3</jackson-dataformat-csv.version>
 
         <spark-core.version>[2.9.0,)</spark-core.version>
 
-        <jna.version>5.2.0</jna.version>
+        <jna.version>5.6.0</jna.version>
 
-        <scala-library.version>2.13.0</scala-library.version>
-        <junit.version>4.12</junit.version>
+        <scala-library.version>2.13.3</scala-library.version>
+        <junit.version>4.13.1</junit.version>
 
-        <gson.version>2.8.5</gson.version>
-        <json-smart.version>1.2</json-smart.version>
-        <sqlite-jdbc.version>3.25.2</sqlite-jdbc.version>
+        <gson.version>2.8.6</gson.version>
+        <json-smart.version>1.3.1</json-smart.version>
+        <sqlite-jdbc.version>3.32.3.2</sqlite-jdbc.version>
 
-        <nv-websocket-client.version>2.6</nv-websocket-client.version>
+        <nv-websocket-client.version>2.10</nv-websocket-client.version>
         <unirest-java.version>2.5.03</unirest-java.version>
 
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-        <scala-maven-plugin.version>3.4.4</scala-maven-plugin.version>
-        <maven-jar-plugin.version>2.3.1</maven-jar-plugin.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <scala-maven-plugin.version>3.4.6</scala-maven-plugin.version>
+        <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
         <versionizer-maven-plugin.version>1.0.3</versionizer-maven-plugin.version>
     </properties>
 
@@ -136,12 +136,12 @@
         <repository>
             <id>release</id>
             <name>TheCodeLabs-releases</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-release</url>
         </repository>
         <snapshotRepository>
             <id>snapshots</id>
             <name>TheCodeLabs-snapshots</name>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
@@ -159,7 +159,7 @@
         </pluginRepository>
         <pluginRepository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-plugins-release</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-plugins-release</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -169,7 +169,7 @@
         </pluginRepository>
         <pluginRepository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-plugins-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-plugins-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>
@@ -200,7 +200,7 @@
 
         <repository>
             <id>release</id>
-            <url>https://maven.thecodedev.de/artifactory/Releases</url>
+            <url>https://maven.thecodelabs.de/artifactory/Releases</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -210,7 +210,7 @@
         </repository>
         <repository>
             <id>snapshots</id>
-            <url>https://maven.thecodedev.de/artifactory/TheCodeLabs-snapshots</url>
+            <url>https://maven.thecodelabs.de/artifactory/TheCodeLabs-snapshots</url>
             <releases>
                 <enabled>false</enabled>
             </releases>