diff --git a/include/Config.h b/include/Config.h

index 6e086f54..9cce1929 100644
--- a/include/Config.h
+++ b/include/Config.h
@@ -9,91 +9,95 @@
 
 namespace conf {
 // Global settings.
-static constexpr int fontSize                   = 14;
-static constexpr int textInputFontSize          = 14;
-static constexpr int emojiSize                  = 14;
-static constexpr int headerFontSize             = 21;
-static constexpr int typingNotificationFontSize = 11;
+constexpr int fontSize                   = 14;
+constexpr int textInputFontSize          = 14;
+constexpr int emojiSize                  = 14;
+constexpr int headerFontSize             = 21;
+constexpr int typingNotificationFontSize = 11;
 
 namespace popup {
-static constexpr int font   = fontSize;
-static constexpr int avatar = 28;
+constexpr int font   = fontSize;
+constexpr int avatar = 28;
+}
+
+namespace modals {
+constexpr int errorFont = conf::fontSize - 2;
 }
 
 namespace receipts {
-static constexpr int font = 12;
+constexpr int font = 12;
 }
 
 namespace dialogs {
-static constexpr int labelSize = 15;
+constexpr int labelSize = 15;
 }
 
 namespace strings {
-static const QString url_html = "<a href=\"\\1\">\\1</a>";
-static const QRegExp url_regex(
+const QString url_html = "<a href=\"\\1\">\\1</a>";
+const QRegExp url_regex(
   "((www\\.(?!\\.)|[a-z][a-z0-9+.-]*://)[^\\s<>'\"]+[^!,\\.\\s<>'\"\\]\\)\\:])");
 }
 
 // Window geometry.
 namespace window {
-static constexpr int height = 600;
-static constexpr int width  = 1066;
+constexpr int height = 600;
+constexpr int width  = 1066;
 
-static constexpr int minHeight = height;
-static constexpr int minWidth  = 950;
+constexpr int minHeight = height;
+constexpr int minWidth  = 950;
 } // namespace window
 
 namespace textInput {
-static constexpr int height = 50;
+constexpr int height = 50;
 }
 
 namespace sidebarActions {
-static constexpr int height   = textInput::height;
-static constexpr int iconSize = 28;
+constexpr int height   = textInput::height;
+constexpr int iconSize = 28;
 }
 
 // Button settings.
 namespace btn {
-static constexpr int fontSize     = 20;
-static constexpr int cornerRadius = 3;
+constexpr int fontSize     = 20;
+constexpr int cornerRadius = 3;
 } // namespace btn
 
 // RoomList specific.
 namespace roomlist {
 namespace fonts {
-static constexpr int heading         = 13;
-static constexpr int timestamp       = heading;
-static constexpr int badge           = 10;
-static constexpr int bubble          = 20;
-static constexpr int communityBubble = bubble - 4;
+constexpr int heading         = 13;
+constexpr int timestamp       = heading;
+constexpr int badge           = 10;
+constexpr int bubble          = 20;
+constexpr int communityBubble = bubble - 4;
 } // namespace fonts
 } // namespace roomlist
 
 namespace userInfoWidget {
 namespace fonts {
-static constexpr int displayName = 16;
-static constexpr int userid      = 14;
+constexpr int displayName = 16;
+constexpr int userid      = 14;
 } // namespace fonts
 } // namespace userInfoWidget
 
 namespace topRoomBar {
 namespace fonts {
-static constexpr int roomName        = 15;
-static constexpr int roomDescription = 14;
+constexpr int roomName        = 15;
+constexpr int roomDescription = 14;
 } // namespace fonts
 } // namespace topRoomBar
 
 namespace timeline {
-static constexpr int msgAvatarTopMargin = 15;
-static constexpr int msgTopMargin       = 2;
-static constexpr int msgLeftMargin      = 14;
-static constexpr int avatarSize         = 36;
-static constexpr int headerSpacing      = 3;
-static constexpr int headerLeftMargin   = 15;
+constexpr int msgAvatarTopMargin = 15;
+constexpr int msgTopMargin       = 2;
+constexpr int msgLeftMargin      = 14;
+constexpr int avatarSize         = 36;
+constexpr int headerSpacing      = 3;
+constexpr int headerLeftMargin   = 15;
 
 namespace fonts {
-static constexpr int timestamp     = 13;
-static constexpr int dateSeparator = conf::fontSize;
+constexpr int timestamp     = 13;
+constexpr int dateSeparator = conf::fontSize;
 } // namespace fonts
 } // namespace timeline