diff --git a/apps/code/app.cpp b/apps/code/app.cpp
index 29f48f0c8..03e5540f7 100644
--- a/apps/code/app.cpp
+++ b/apps/code/app.cpp
@@ -40,9 +40,13 @@ Program * App::Snapshot::program() {
   return &m_program;
 }
 
+static I18n::Message sCodeMessages[] = {I18n::Message::BetaVersion, I18n::Message::BetaVersionMessage1, I18n::Message::BetaVersionMessage2, I18n::Message::BetaVersionMessage3, I18n::Message::BetaVersionMessage4};
+
+static KDColor sCodeColors[] = {KDColorBlack, KDColorBlack, KDColorBlack, KDColorBlack, KDColorBlack};
+
 App::App(Container * container, Snapshot * snapshot) :
   ::App(container, snapshot, &m_menuController, I18n::Message::Warning),
-  m_betaVersionController(I18n::Message::BetaVersion, I18n::Message::BetaVersionMessage1, I18n::Message::BetaVersionMessage2, I18n::Message::BetaVersionMessage3, I18n::Message::BetaVersionMessage4),
+  m_betaVersionController(sCodeMessages, sCodeColors),
   m_menuController(this, snapshot->program())
 {
 }
diff --git a/apps/on_boarding/update_controller.cpp b/apps/on_boarding/update_controller.cpp
index d8035fe6c..d9ec6fd15 100644
--- a/apps/on_boarding/update_controller.cpp
+++ b/apps/on_boarding/update_controller.cpp
@@ -4,8 +4,12 @@
 
 namespace OnBoarding {
 
+static I18n::Message sOnBoardingMessages[] = {I18n::Message::UpdateAvailable, I18n::Message::UpdateMessage1, I18n::Message::UpdateMessage2, I18n::Message::UpdateMessage3, I18n::Message::UpdateMessage4};
+
+static KDColor sOnBoardingColors[] = {KDColorBlack, KDColorBlack, KDColorBlack, KDColorBlack, Palette::YellowDark};
+
 UpdateController::UpdateController() :
-  MessageController(I18n::Message::UpdateAvailable, I18n::Message::UpdateMessage1, I18n::Message::UpdateMessage2, I18n::Message::UpdateMessage3, I18n::Message::UpdateMessage4)
+  MessageController(sOnBoardingMessages, sOnBoardingColors)
 {
 }
 
diff --git a/apps/shared/message_controller.cpp b/apps/shared/message_controller.cpp
index e9331ef3f..bd830c2db 100644
--- a/apps/shared/message_controller.cpp
+++ b/apps/shared/message_controller.cpp
@@ -2,9 +2,9 @@
 #include "../apps_container.h"
 #include <assert.h>
 
-MessageController::MessageController(I18n::Message title, I18n::Message message1, I18n::Message message2, I18n::Message message3, I18n::Message message4) :
+MessageController::MessageController(I18n::Message * messages, KDColor * colors) :
   ViewController(nullptr),
-  m_contentView(title, message1, message2, message3, message4)
+  m_contentView(messages, colors)
 {
 }
 
@@ -20,12 +20,12 @@ bool MessageController::handleEvent(Ion::Events::Event event) {
   return false;
 }
 
-MessageController::ContentView::ContentView(I18n::Message title, I18n::Message message1, I18n::Message message2, I18n::Message message3, I18n::Message message4) :
-  m_titleTextView(KDText::FontSize::Large, title, 0.5f, 0.5f),
-  m_messageTextView1(KDText::FontSize::Small, message1, 0.5f, 0.5f),
-  m_messageTextView2(KDText::FontSize::Small, message2, 0.5f, 0.5f),
-  m_messageTextView3(KDText::FontSize::Small, message3, 0.5f, 0.5f),
-  m_messageTextView4(KDText::FontSize::Small, message4, 0.5f, 0.5f, Palette::YellowDark),
+MessageController::ContentView::ContentView(I18n::Message * messages, KDColor * colors) :
+  m_titleTextView(KDText::FontSize::Large, messages[0], 0.5f, 0.5f, colors[0]),
+  m_messageTextView1(KDText::FontSize::Small, messages[1], 0.5f, 0.5f, colors[1]),
+  m_messageTextView2(KDText::FontSize::Small, messages[2], 0.5f, 0.5f, colors[2]),
+  m_messageTextView3(KDText::FontSize::Small, messages[3], 0.5f, 0.5f, colors[3]),
+  m_messageTextView4(KDText::FontSize::Small, messages[4], 0.5f, 0.5f, colors[4]),
   m_skipView(KDText::FontSize::Small, I18n::Message::Skip, 1.0f, 0.5f),
   m_okView()
 {
diff --git a/apps/shared/message_controller.h b/apps/shared/message_controller.h
index 414ac0aae..d08116ef6 100644
--- a/apps/shared/message_controller.h
+++ b/apps/shared/message_controller.h
@@ -6,13 +6,13 @@
 
 class MessageController : public ViewController {
 public:
-  MessageController(I18n::Message title, I18n::Message message1, I18n::Message message2, I18n::Message message3, I18n::Message message4);
+  MessageController(I18n::Message * messages, KDColor * colors);
   View * view() override;
   bool handleEvent(Ion::Events::Event event) override;
 private:
   class ContentView : public View {
   public:
-    ContentView(I18n::Message title, I18n::Message message1, I18n::Message message2, I18n::Message message3, I18n::Message message4);
+    ContentView(I18n::Message * messages, KDColor * colors);
     void drawRect(KDContext * ctx, KDRect rect) const override;
   private:
     constexpr static KDCoordinate k_titleMargin = 40;