diff --git a/README.md b/README.md
index 907227fe..289f0116 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,7 @@
 
 This is a fork of the [Havoc](https://github.com/furrtek/portapack-havoc/) firmware, which itself was a fork of the [PortaPack](https://github.com/sharebrained/portapack-hackrf) firmware, an add-on for the [HackRF](http://greatscottgadgets.com/hackrf/). A fork is a derivate, in this case one that has extra features and fixes when compared to the older versions.
 
-[<img src="https://raw.githubusercontent.com/wiki/portapack-mayhem/mayhem-firmware/img/hw_overview_h2_front.png" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview) [<img src="https://raw.githubusercontent.com/wiki/portapack-mayhem/mayhem-firmware/img/hw_overview_h2_inside.png" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/Hardware-overview#portapack-internals)
-
-*[PortaPack H2+HackRF+battery](https://www.ebay.com/itm/116382397447) (clone) with a custom [3d printed case](https://github.com/portapack-mayhem/mayhem-firmware/wiki/3d-printed-enclosure)*
+[<img src="https://private-user-images.githubusercontent.com/4393979/370578785-b393c64a-932b-4e33-818b-3927900c2c71.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzQ1MTQ1MjMsIm5iZiI6MTczNDUxNDIyMywicGF0aCI6Ii80MzkzOTc5LzM3MDU3ODc4NS1iMzkzYzY0YS05MzJiLTRlMzMtODE4Yi0zOTI3OTAwYzJjNzEucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MTIxOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDEyMThUMDkzMDIzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9ZDE0NTdhNGFhMjYyNzVhODcyNjgzZGM3M2IyN2I5MWI5N2RhNmM5NTUyZTg2ODVkYjEyY2NkMTQwZjI4Yjg0OSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.ljNb6TMRE1s4jtEWdg6yBLCmKM9ePHxRGacy7ZnkwOQ" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#new-h4m-mayhem-edition) [<img src="https://camo.githubusercontent.com/5c1f1da0688240ac7b2ccca0c8dbfd1d73f2540741ad8b1828ba4d5ea68af248/68747470733a2f2f6769746875622d70726f64756374696f6e2d757365722d61737365742d3632313064662e73332e616d617a6f6e6177732e636f6d2f343339333937392f3239353533323731382d38653562363631632d663934362d346365652d386232642d3061363135663737313566342e706e67" height="400">](https://github.com/portapack-mayhem/mayhem-firmware/wiki/PortaPack-Versions#h2m-mayhem-edition)
 
 # What is this?
 
diff --git a/firmware/application/external/audio_test/ui_audio_test.cpp b/firmware/application/external/audio_test/ui_audio_test.cpp
index de138764..8b6de1de 100644
--- a/firmware/application/external/audio_test/ui_audio_test.cpp
+++ b/firmware/application/external/audio_test/ui_audio_test.cpp
@@ -26,7 +26,7 @@
 
 using namespace portapack;
 
-namespace ui {
+namespace ui::external_app::audio_test {
 
 AudioTestView::AudioTestView(NavigationView& nav)
     : nav_{nav} {
@@ -103,4 +103,4 @@ void AudioTestView::update_audio_beep() {
         baseband::request_beep_stop();
 }
 
-} /* namespace ui */
+} /* namespace ui::external_app::audio_test */
diff --git a/firmware/application/external/audio_test/ui_audio_test.hpp b/firmware/application/external/audio_test/ui_audio_test.hpp
index 1d6119b5..65003303 100644
--- a/firmware/application/external/audio_test/ui_audio_test.hpp
+++ b/firmware/application/external/audio_test/ui_audio_test.hpp
@@ -25,7 +25,7 @@
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
 
-namespace ui {
+namespace ui::external_app::audio_test {
 
 class AudioTestView : public View {
    public:
@@ -96,6 +96,6 @@ class AudioTestView : public View {
         Theme::getInstance()->bg_dark->background};
 };
 
-} /* namespace ui */
+} /* namespace ui::external_app::audio_test */
 
 #endif /*__UI_AUDIO_TEST_H__*/