diff --git a/libfcl-dev/install.yaml b/libfcl-dev/install.yaml
new file mode 100644
index 000000000..4ea57261e
--- /dev/null
+++ b/libfcl-dev/install.yaml
@@ -0,0 +1,2 @@
+- type: system
+  name: libfcl-dev
diff --git a/pycharm-professional/pycharm-professional_pycharm-professional.desktop b/pycharm-professional/pycharm-professional_pycharm-professional.desktop
index e52003aab..668960c29 100755
--- a/pycharm-professional/pycharm-professional_pycharm-professional.desktop
+++ b/pycharm-professional/pycharm-professional_pycharm-professional.desktop
@@ -4,7 +4,7 @@ Version=1.0
 Type=Application
 Name=PyCharm Professional Edition
 Icon=/snap/pycharm-professional/current/bin/pycharm.png
-Exec=env BAMF_DESKTOP_FILE_HINT=~/.local/applications/pycharm-professional_pycharm-professional.desktop bash -c "shopt -s expand_aliases && source ~/.tue/setup.bash && pycharm-professional %F"
+Exec=env BAMF_DESKTOP_FILE_HINT=~/.local/share/applications/pycharm-professional_pycharm-professional.desktop bash -c "shopt -s expand_aliases && source ~/.tue/setup.bash && pycharm-professional %F"
 Comment=Python IDE for Professional Developers
 Categories=Development;IDE;
 Terminal=false
diff --git a/pycharm/pycharm-community_pycharm-community.desktop b/pycharm/pycharm-community_pycharm-community.desktop
index 328a9cd06..9e1fbfe54 100644
--- a/pycharm/pycharm-community_pycharm-community.desktop
+++ b/pycharm/pycharm-community_pycharm-community.desktop
@@ -4,7 +4,7 @@ Version=1.0
 Type=Application
 Name=PyCharm Community Edition
 Icon=/snap/pycharm-community/current/bin/pycharm.png
-Exec=env BAMF_DESKTOP_FILE_HINT=~/.local/applications/pycharm-community_pycharm-community.desktop bash -c "shopt -s expand_aliases && source ~/.tue/setup.bash && pycharm-community %F"
+Exec=env BAMF_DESKTOP_FILE_HINT=~/.local/share/applications/pycharm-community_pycharm-community.desktop bash -c "shopt -s expand_aliases && source ~/.tue/setup.bash && pycharm-community %F"
 Comment=Python IDE for Professional Developers
 Categories=Development;IDE;
 Terminal=false
diff --git a/python3-colcon-ros-domain-id-coordinator/install.yaml b/python3-colcon-ros-domain-id-coordinator/install.yaml
new file mode 100644
index 000000000..369ae02ac
--- /dev/null
+++ b/python3-colcon-ros-domain-id-coordinator/install.yaml
@@ -0,0 +1,2 @@
+- type: system
+  name: python3-colcon-ros-domain-id-coordinator
diff --git a/ros-ament_cmake_google_benchmark/install.yaml b/ros-ament_cmake_google_benchmark/install.yaml
new file mode 100644
index 000000000..d2d15cee1
--- /dev/null
+++ b/ros-ament_cmake_google_benchmark/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: ament-cmake-google-benchmark
diff --git a/ros-common_interfaces/install.yaml b/ros-common_interfaces/install.yaml
new file mode 100644
index 000000000..114da5e62
--- /dev/null
+++ b/ros-common_interfaces/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: common-interfaces
diff --git a/ros-eigen_stl_containers/install.yaml b/ros-eigen_stl_containers/install.yaml
new file mode 100644
index 000000000..95477b5dc
--- /dev/null
+++ b/ros-eigen_stl_containers/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: eigen-stl-containers
diff --git a/ros-google_benchmark_vendor/install.yaml b/ros-google_benchmark_vendor/install.yaml
new file mode 100644
index 000000000..0542e8696
--- /dev/null
+++ b/ros-google_benchmark_vendor/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: google-benchmark-vendor
diff --git a/ros-osqp_vendor/install.yaml b/ros-osqp_vendor/install.yaml
new file mode 100644
index 000000000..fd3cb44b4
--- /dev/null
+++ b/ros-osqp_vendor/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: osqp-vendor
diff --git a/ros-qt_gui/install.yaml b/ros-qt_gui/install.yaml
new file mode 100644
index 000000000..dcceb9585
--- /dev/null
+++ b/ros-qt_gui/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: qt-gui
diff --git a/ros-random_numbers/install.yaml b/ros-random_numbers/install.yaml
new file mode 100644
index 000000000..4b97ea92a
--- /dev/null
+++ b/ros-random_numbers/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: random-numbers
diff --git a/ros-rmw_cyclonedds_cpp/install.yaml b/ros-rmw_cyclonedds_cpp/install.yaml
new file mode 100644
index 000000000..0e62f2eea
--- /dev/null
+++ b/ros-rmw_cyclonedds_cpp/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: rmw-cyclonedds-cpp
diff --git a/ros-rsl/install.yaml b/ros-rsl/install.yaml
new file mode 100644
index 000000000..0cd0a113c
--- /dev/null
+++ b/ros-rsl/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: rsl
diff --git a/ros-ruckig/install.yaml b/ros-ruckig/install.yaml
new file mode 100644
index 000000000..e9b8d9f75
--- /dev/null
+++ b/ros-ruckig/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: ruckig
diff --git a/ros-turtlesim/install.yaml b/ros-turtlesim/install.yaml
new file mode 100644
index 000000000..24f3c408b
--- /dev/null
+++ b/ros-turtlesim/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: turtlesim
diff --git a/ros-urdfdom/install.yaml b/ros-urdfdom/install.yaml
new file mode 100644
index 000000000..086b336aa
--- /dev/null
+++ b/ros-urdfdom/install.yaml
@@ -0,0 +1,4 @@
+- type: ros
+  source:
+    type: system
+    name: urdfdom
diff --git a/ros2/setup b/ros2/setup
index 9e7cb6d30..efa79c27a 100644
--- a/ros2/setup
+++ b/ros2/setup
@@ -44,8 +44,8 @@ else
 fi
 
 # shellcheck disable=SC2016
-ROSCONSOLE_FORMAT='[${severity}][${node}][${time}]: ${message}'
-export ROSCONSOLE_FORMAT
+RCUTILS_CONSOLE_OUTPUT_FORMAT='[{severity}] [{name}] [{time}]: {message}'
+export RCUTILS_CONSOLE_OUTPUT_FORMAT
 
 # shellcheck disable=SC2016
 # Make eProsima DDS implementation default
diff --git a/webstorm/.ci_ignore b/webstorm/.ci_ignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/webstorm/install.bash b/webstorm/install.bash
new file mode 100644
index 000000000..5719e6d88
--- /dev/null
+++ b/webstorm/install.bash
@@ -0,0 +1,4 @@
+#! /usr/bin/env bash
+
+# Shortcut
+tue-install-cp webstorm_webstorm.desktop ~/.local/share/applications/webstorm_webstorm.desktop
diff --git a/webstorm/install.yaml b/webstorm/install.yaml
new file mode 100644
index 000000000..50872e881
--- /dev/null
+++ b/webstorm/install.yaml
@@ -0,0 +1,2 @@
+- type: snap
+  name: webstorm
diff --git a/webstorm/webstorm_webstorm.desktop b/webstorm/webstorm_webstorm.desktop
new file mode 100755
index 000000000..fa079f1d2
--- /dev/null
+++ b/webstorm/webstorm_webstorm.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+X-SnapInstanceName=webstorm
+Version=1.0
+Type=Application
+Name=WebStorm
+Icon=/snap/webstorm/current/bin/webstorm.png
+Exec=env BAMF_DESKTOP_FILE_HINT=~/.local/share/applications/webstorm_webstorm.desktop -c "shopt -s expand_aliases && source ~/.tue/setup.bash && webstorm %F"
+Comment=The smartest JavaScript IDE
+Categories=Development;IDE;
+Terminal=false
+StartupWMClass=jetbrains-webstorm
+StartupNotify=true