diff --git a/src/c3nav/control/templates/control/mesh_messages.html b/src/c3nav/control/templates/control/mesh_messages.html
index 7741b88b..f8b102ce 100644
--- a/src/c3nav/control/templates/control/mesh_messages.html
+++ b/src/c3nav/control/templates/control/mesh_messages.html
@@ -37,11 +37,11 @@
                     {% if msg.get_message_type_display == "CONFIG_FIRMWARE" %}
                         <strong>Chip:</strong> {{ msg.parsed.get_chip_display }} rev{{ msg.parsed.revision_major }}.{{ msg.parsed.revision_minor }}
                         <br>
-                        <strong>Firmware:</strong> {{ msg.parsed.project_name }} {{ msg.parsed.version }} (IDF {{ msg.parsed.idf_version }})
+                        <strong>Firmware:</strong> {{ msg.parsed.app_desc.project_name }} {{ msg.parsed.app_desc.version }} (IDF {{ msg.parsed.app_desc.idf_version }})
                         <br>
-                        <strong>Compile Date:</strong> {{ msg.parsed.compile_date }} {{ msg.parsed.compile_time }}
+                        <strong>Compile Date:</strong> {{ msg.parsed.app_desc.compile_date }} {{ msg.parsed.app_desc.compile_time }}
                         <br>
-                        <strong>SHA256:</strong> <small>{{ msg.parsed.app_elf_sha256 }}</small>
+                        <strong>SHA256:</strong> <small>{{ msg.parsed.app_desc.app_elf_sha256 }}</small>
 
                     {% elif msg.get_message_type_display == "CONFIG_UPLINK" %}
                         <strong>Enabled:</strong> {{ msg.parsed.enabled }},
diff --git a/src/c3nav/control/templates/control/mesh_node_detail.html b/src/c3nav/control/templates/control/mesh_node_detail.html
index 82e441e0..233991fc 100644
--- a/src/c3nav/control/templates/control/mesh_node_detail.html
+++ b/src/c3nav/control/templates/control/mesh_node_detail.html
@@ -42,11 +42,11 @@
                 <strong>Chip:</strong> {{ node.last_messages.CONFIG_FIRMWARE.parsed.get_chip_display }}
                 rev{{ node.last_messages.CONFIG_FIRMWARE.parsed.revision_major }}.{{ node.last_messages.CONFIG_FIRMWARE.parsed.revision_minor }}
                 <br>
-                <strong>Firmware:</strong> {{ node.last_messages.CONFIG_FIRMWARE.parsed.project_name }} {{ node.last_messages.CONFIG_FIRMWARE.parsed.version }} (IDF {{ node.last_messages.CONFIG_FIRMWARE.parsed.idf_version }})
+                <strong>Firmware:</strong> {{ node.last_messages.CONFIG_FIRMWARE.parsed.app_desc.project_name }} {{ node.last_messages.CONFIG_FIRMWARE.parsed.version }} (IDF {{ node.last_messages.CONFIG_FIRMWARE.parsed.app_desc.idf_version }})
                 <br>
-                <strong>Compile Date:</strong> {{ node.last_messages.CONFIG_FIRMWARE.parsed.compile_date }} {{ node.last_messages.CONFIG_FIRMWARE.parsed.compile_time }}
+                <strong>Compile Date:</strong> {{ node.last_messages.CONFIG_FIRMWARE.parsed.app_desc.compile_date }} {{ node.last_messages.CONFIG_FIRMWARE.parsed.app_desc.compile_time }}
                 <br>
-                <strong>SHA256:</strong> <small>{{ node.last_messages.CONFIG_FIRMWARE.parsed.app_elf_sha256 }}</small>
+                <strong>SHA256:</strong> <small>{{ node.last_messages.CONFIG_FIRMWARE.parsed.app_desc.app_elf_sha256 }}</small>
             </p>
         </div>
         <div>
diff --git a/src/c3nav/control/templates/control/mesh_nodes.html b/src/c3nav/control/templates/control/mesh_nodes.html
index 981cdfa9..60f799a7 100644
--- a/src/c3nav/control/templates/control/mesh_nodes.html
+++ b/src/c3nav/control/templates/control/mesh_nodes.html
@@ -49,8 +49,8 @@
                     <small>rev{{ node.last_messages.CONFIG_FIRMWARE.parsed.revision_major }}.{{ node.last_messages.CONFIG_FIRMWARE.parsed.revision_minor }}</small>
                 </td>
                 <td>
-                    {{ node.last_messages.CONFIG_FIRMWARE.parsed.version }}
-                    <small>(IDF {{ node.last_messages.CONFIG_FIRMWARE.parsed.idf_version }})</small>
+                    {{ node.last_messages.CONFIG_FIRMWARE.parsed.app_desc.version }}
+                    <small>(IDF {{ node.last_messages.CONFIG_FIRMWARE.parsed.app_desc.idf_version }})</small>
                 </td>
                 <td>
                     {% blocktrans trimmed with timesince=node.last_msg|timesince %}
diff --git a/src/c3nav/mesh/baseformats.py b/src/c3nav/mesh/baseformats.py
index dc8ccb78..149e1290 100644
--- a/src/c3nav/mesh/baseformats.py
+++ b/src/c3nav/mesh/baseformats.py
@@ -182,7 +182,8 @@ class StructType:
     def __init_subclass__(cls, /, union_type_field=None, existing_c_struct=None, **kwargs):
         cls.union_type_field = union_type_field
         if cls.existing_c_struct is not None:
-            raise TypeError('subclassing an external c struct is not possible') # TODO: can we make it possible? does it even make sense?
+            # TODO: can we make it possible? does it even make sense?
+            raise TypeError('subclassing an external c struct is not possible')
         cls.existing_c_struct = existing_c_struct
         if union_type_field:
             if union_type_field in cls._union_options: