diff --git a/extras/cad/README.md b/extras/cad/README.md
index 9dcba5b..b8eddf2 100644
--- a/extras/cad/README.md
+++ b/extras/cad/README.md
@@ -7,5 +7,6 @@
 👉 Rubber duck antenna spiral widing was done with 1.3mm copper wire on 8mm aluminium scaffolding tube.
 
 **Tracker case**:
-- `aprs_tracker_e22_v2` - base for tracker case.
-- `aprs_tracker_e22_cover_v2` - upper cover for tracker case.
+- `aprs_tracker_e22_base` - base for tracker case without battery compartment.
+- `aprs_tracker_e22_cover` - upper cover for headless tracker with screen and controls.
+- 
diff --git a/extras/cad/aprs_tracker_e22_antenna_ring.FCStd b/extras/cad/aprs_tracker_e22_antenna_ring.FCStd
new file mode 100644
index 0000000..96bb2d8
Binary files /dev/null and b/extras/cad/aprs_tracker_e22_antenna_ring.FCStd differ
diff --git a/extras/cad/aprs_tracker_e22_antenna_ring.stl b/extras/cad/aprs_tracker_e22_antenna_ring.stl
new file mode 100644
index 0000000..803f5f3
Binary files /dev/null and b/extras/cad/aprs_tracker_e22_antenna_ring.stl differ
diff --git a/extras/cad/aprs_tracker_e22_base.FCStd b/extras/cad/aprs_tracker_e22_base.FCStd
new file mode 100644
index 0000000..bfbb51f
Binary files /dev/null and b/extras/cad/aprs_tracker_e22_base.FCStd differ
diff --git a/extras/cad/aprs_tracker_e22_v2.stl b/extras/cad/aprs_tracker_e22_base.stl
similarity index 100%
rename from extras/cad/aprs_tracker_e22_v2.stl
rename to extras/cad/aprs_tracker_e22_base.stl
diff --git a/extras/cad/aprs_tracker_e22_base_battery.FCStd b/extras/cad/aprs_tracker_e22_base_battery.FCStd
new file mode 100644
index 0000000..6c54927
Binary files /dev/null and b/extras/cad/aprs_tracker_e22_base_battery.FCStd differ
diff --git a/extras/cad/aprs_tracker_e22_base_battery.stl b/extras/cad/aprs_tracker_e22_base_battery.stl
new file mode 100644
index 0000000..e48c9f7
Binary files /dev/null and b/extras/cad/aprs_tracker_e22_base_battery.stl differ
diff --git a/extras/cad/aprs_tracker_e22_base_battery_lid.FCStd b/extras/cad/aprs_tracker_e22_base_battery_lid.FCStd
new file mode 100644
index 0000000..3c70c32
Binary files /dev/null and b/extras/cad/aprs_tracker_e22_base_battery_lid.FCStd differ
diff --git a/extras/cad/aprs_tracker_e22_base_battery_lid.stl b/extras/cad/aprs_tracker_e22_base_battery_lid.stl
new file mode 100644
index 0000000..a37e213
Binary files /dev/null and b/extras/cad/aprs_tracker_e22_base_battery_lid.stl differ
diff --git a/extras/cad/aprs_tracker_e22_cover_v2.FCStd b/extras/cad/aprs_tracker_e22_cover.FCStd
similarity index 100%
rename from extras/cad/aprs_tracker_e22_cover_v2.FCStd
rename to extras/cad/aprs_tracker_e22_cover.FCStd
diff --git a/extras/cad/aprs_tracker_e22_cover_v2.stl b/extras/cad/aprs_tracker_e22_cover.stl
similarity index 100%
rename from extras/cad/aprs_tracker_e22_cover_v2.stl
rename to extras/cad/aprs_tracker_e22_cover.stl
diff --git a/extras/cad/aprs_tracker_e22_cover_dv.FCStd b/extras/cad/aprs_tracker_e22_cover_dv.FCStd
new file mode 100644
index 0000000..9c1808e
Binary files /dev/null and b/extras/cad/aprs_tracker_e22_cover_dv.FCStd differ
diff --git a/extras/cad/aprs_tracker_e22_cover_dv.stl b/extras/cad/aprs_tracker_e22_cover_dv.stl
new file mode 100644
index 0000000..35d099d
Binary files /dev/null and b/extras/cad/aprs_tracker_e22_cover_dv.stl differ
diff --git a/extras/cad/aprs_tracker_e22_v2.FCStd b/extras/cad/aprs_tracker_e22_v2.FCStd
deleted file mode 100644
index 917192f..0000000
Binary files a/extras/cad/aprs_tracker_e22_v2.FCStd and /dev/null differ
diff --git a/extras/images/device.png b/extras/images/device.png
index 28a3089..3e7dfea 100644
Binary files a/extras/images/device.png and b/extras/images/device.png differ