diff --git a/src/bitbots_behavior/bitbots_body_behavior/launch/behavior.launch b/src/bitbots_behavior/bitbots_body_behavior/launch/behavior.launch
index cf715e8c2..10bdd4baf 100644
--- a/src/bitbots_behavior/bitbots_body_behavior/launch/behavior.launch
+++ b/src/bitbots_behavior/bitbots_body_behavior/launch/behavior.launch
@@ -3,10 +3,8 @@
-
-
-
+
diff --git a/src/bitbots_lowlevel/bitbots_ros_control/launch/ros_control.launch b/src/bitbots_lowlevel/bitbots_ros_control/launch/ros_control.launch
index f76b243c3..36247f7b2 100644
--- a/src/bitbots_lowlevel/bitbots_ros_control/launch/ros_control.launch
+++ b/src/bitbots_lowlevel/bitbots_ros_control/launch/ros_control.launch
@@ -6,10 +6,7 @@
-
-
-
-
+
diff --git a/src/bitbots_misc/bitbots_basler_camera/launch/basler_camera.launch b/src/bitbots_misc/bitbots_basler_camera/launch/basler_camera.launch
index 56263a669..29a638115 100644
--- a/src/bitbots_misc/bitbots_basler_camera/launch/basler_camera.launch
+++ b/src/bitbots_misc/bitbots_basler_camera/launch/basler_camera.launch
@@ -1,9 +1,7 @@
-
-
-
+
diff --git a/src/bitbots_misc/bitbots_ceiling_cam/launch/ceiling_cam.launch b/src/bitbots_misc/bitbots_ceiling_cam/launch/ceiling_cam.launch
index de3c237db..031e1d896 100644
--- a/src/bitbots_misc/bitbots_ceiling_cam/launch/ceiling_cam.launch
+++ b/src/bitbots_misc/bitbots_ceiling_cam/launch/ceiling_cam.launch
@@ -3,7 +3,7 @@
-
+
diff --git a/src/bitbots_motion/bitbots_animation_server/launch/animation.launch b/src/bitbots_motion/bitbots_animation_server/launch/animation.launch
index 5984c16df..242309fbc 100644
--- a/src/bitbots_motion/bitbots_animation_server/launch/animation.launch
+++ b/src/bitbots_motion/bitbots_animation_server/launch/animation.launch
@@ -1,9 +1,7 @@
-
-
-
+
-
\ No newline at end of file
+
diff --git a/src/bitbots_motion/bitbots_animation_server/launch/test.launch b/src/bitbots_motion/bitbots_animation_server/launch/test.launch
index 0047584d3..eb974d4b7 100644
--- a/src/bitbots_motion/bitbots_animation_server/launch/test.launch
+++ b/src/bitbots_motion/bitbots_animation_server/launch/test.launch
@@ -1,7 +1,5 @@
-
-
@@ -10,6 +8,6 @@
-
-
+
+
diff --git a/src/bitbots_motion/bitbots_dynamic_kick/launch/dynamic_kick.launch b/src/bitbots_motion/bitbots_dynamic_kick/launch/dynamic_kick.launch
index 5b9e02861..36227185b 100644
--- a/src/bitbots_motion/bitbots_dynamic_kick/launch/dynamic_kick.launch
+++ b/src/bitbots_motion/bitbots_dynamic_kick/launch/dynamic_kick.launch
@@ -3,17 +3,14 @@
-
-
-
-
-
+
-
+
diff --git a/src/bitbots_motion/bitbots_dynamic_kick/launch/test.launch b/src/bitbots_motion/bitbots_dynamic_kick/launch/test.launch
index 1d3e10601..36b6fe10b 100644
--- a/src/bitbots_motion/bitbots_dynamic_kick/launch/test.launch
+++ b/src/bitbots_motion/bitbots_dynamic_kick/launch/test.launch
@@ -3,8 +3,6 @@
-
-
@@ -29,7 +27,7 @@
-
+
@@ -37,14 +35,14 @@
-
+
-
+
diff --git a/src/bitbots_motion/bitbots_dynup/launch/dynup.launch b/src/bitbots_motion/bitbots_dynup/launch/dynup.launch
index 7c8eeb3d8..7c63e29eb 100644
--- a/src/bitbots_motion/bitbots_dynup/launch/dynup.launch
+++ b/src/bitbots_motion/bitbots_dynup/launch/dynup.launch
@@ -1,11 +1,9 @@
-
-
-
+
@@ -14,7 +12,7 @@
-
+
diff --git a/src/bitbots_motion/bitbots_dynup/launch/test.launch b/src/bitbots_motion/bitbots_dynup/launch/test.launch
index 1bcc5845c..b16c85bb4 100644
--- a/src/bitbots_motion/bitbots_dynup/launch/test.launch
+++ b/src/bitbots_motion/bitbots_dynup/launch/test.launch
@@ -5,9 +5,6 @@
-
-
-
@@ -20,7 +17,7 @@
-
+
@@ -33,7 +30,7 @@
-
+
@@ -46,7 +43,7 @@
-
+
diff --git a/src/bitbots_motion/bitbots_hcm/launch/hcm.launch b/src/bitbots_motion/bitbots_hcm/launch/hcm.launch
index 329258863..f8212fcb7 100644
--- a/src/bitbots_motion/bitbots_hcm/launch/hcm.launch
+++ b/src/bitbots_motion/bitbots_hcm/launch/hcm.launch
@@ -5,11 +5,8 @@
-
-
-
-
+
diff --git a/src/bitbots_motion/bitbots_head_mover/launch/head_mover.launch b/src/bitbots_motion/bitbots_head_mover/launch/head_mover.launch
index 51a2aa9f6..b1742b2a5 100644
--- a/src/bitbots_motion/bitbots_head_mover/launch/head_mover.launch
+++ b/src/bitbots_motion/bitbots_head_mover/launch/head_mover.launch
@@ -2,8 +2,6 @@
-
-
diff --git a/src/bitbots_motion/bitbots_quintic_walk/launch/quintic_walk.launch b/src/bitbots_motion/bitbots_quintic_walk/launch/quintic_walk.launch
index 967fc87fa..a345eb5e0 100644
--- a/src/bitbots_motion/bitbots_quintic_walk/launch/quintic_walk.launch
+++ b/src/bitbots_motion/bitbots_quintic_walk/launch/quintic_walk.launch
@@ -3,16 +3,13 @@
-
-
-
-
+
-
+
diff --git a/src/bitbots_motion/bitbots_quintic_walk/launch/test.launch b/src/bitbots_motion/bitbots_quintic_walk/launch/test.launch
index 85b2ff935..e59294354 100644
--- a/src/bitbots_motion/bitbots_quintic_walk/launch/test.launch
+++ b/src/bitbots_motion/bitbots_quintic_walk/launch/test.launch
@@ -4,9 +4,6 @@
-
-
-
@@ -30,7 +27,7 @@
-
+
@@ -38,7 +35,7 @@
-
+
diff --git a/src/bitbots_motion/bitbots_rl_motion/launch/rl_walk.launch b/src/bitbots_motion/bitbots_rl_motion/launch/rl_walk.launch
index 08028179c..4ac54ed21 100644
--- a/src/bitbots_motion/bitbots_rl_motion/launch/rl_walk.launch
+++ b/src/bitbots_motion/bitbots_rl_motion/launch/rl_walk.launch
@@ -2,16 +2,13 @@
-
-
-
-
+
diff --git a/src/bitbots_motion/bitbots_rl_motion/launch/test.launch b/src/bitbots_motion/bitbots_rl_motion/launch/test.launch
index 638d8babd..6892fad7e 100644
--- a/src/bitbots_motion/bitbots_rl_motion/launch/test.launch
+++ b/src/bitbots_motion/bitbots_rl_motion/launch/test.launch
@@ -3,9 +3,6 @@
-
-
-
@@ -32,13 +29,13 @@
-
+
-
+
diff --git a/src/bitbots_navigation/bitbots_localization/launch/localization.launch b/src/bitbots_navigation/bitbots_localization/launch/localization.launch
index 744de87d7..16090d1ae 100644
--- a/src/bitbots_navigation/bitbots_localization/launch/localization.launch
+++ b/src/bitbots_navigation/bitbots_localization/launch/localization.launch
@@ -2,14 +2,9 @@
-
-
-
-
-
-
+
@@ -20,7 +15,7 @@
-
+
diff --git a/src/bitbots_navigation/bitbots_odometry/launch/odometry.launch b/src/bitbots_navigation/bitbots_odometry/launch/odometry.launch
index df13a2816..e0a1f06bd 100644
--- a/src/bitbots_navigation/bitbots_odometry/launch/odometry.launch
+++ b/src/bitbots_navigation/bitbots_odometry/launch/odometry.launch
@@ -2,10 +2,7 @@
-
-
-
-
+
@@ -14,7 +11,7 @@
-
+
diff --git a/src/bitbots_vision/launch/vision.launch b/src/bitbots_vision/launch/vision.launch
index 21ab8e42c..4b3bf8d48 100644
--- a/src/bitbots_vision/launch/vision.launch
+++ b/src/bitbots_vision/launch/vision.launch
@@ -4,11 +4,9 @@
-
-
-
+
@@ -18,7 +16,7 @@
-
+