Merge lp:~widelands-dev/widelands/font_size-lua into lp:widelands

[GunChleoc]

Except for scenario and win condition messages, define all font styles via Lua. Reduce the number of construtors in TextArea.

The long-term goal is to allow user-defined styles.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4882. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/528138938.
Appveyor build 4663. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_font_size_lua-4663.

[kaputtnik (franku)]

I get a crash when trying to open the buildings statistics menu:

Texture (21925, 7772) too big! Maximum size is 2048.
Fatal exception: Texture (21925, 7772) too big! Maximum size is 2048.
FATAL ERROR - game crashed. Attempting emergency save.

The crash does not appear in current trunk, so i guess it is in this branch.

Backtrace:
FATAL ERROR - game crashed. Attempting emergency save.
Game: Writing Preload Data ...
Thread 1 "widelands" received signal SIGSEGV, Segmentation fault.
Widelands::GamePreloadPacket::write (this=0x7fffffff9700, fs=..., game=...)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/game_io/game_preload_packet.cc:114
114 s.set_int("gametype", static_cast<int32_t>(game.game_controller()->get_game_type()));
(gdb) bt
#0 Widelands::GamePreloadPacket::write (this=0x7fffffff9700, fs=..., game=...)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/game_io/game_preload_packet.cc:114
#1 0x00005555565af007 in Widelands::GameSaver::save (this=0x7fffffff9800)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/game_io/game_saver.cc:51
#2 0x0000555556148385 in SaveHandler::<lambda(FileSystem&)>::operator()(FileSystem &) const (
    __closure=0x7fffffff9cb0, fs=...)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/save_handler.cc:250
#3 0x0000555556148757 in std::_Function_handler<void(FileSystem&), SaveHandler::save_game(Widelands::Game&, const string&, std::__cxx11::string*)::<lambda(FileSystem&)> >::_M_invoke(const std::_Any_data &, FileSystem &) (
    __functor=..., __args#0=...) at /usr/include/c++/8.3.0/bits/std_function.h:297
#4 0x0000555556474f11 in std::function<void (FileSystem&)>::operator()(FileSystem&) const (this=0x7fffffff9cb0,
    __args#0=...) at /usr/include/c++/8.3.0/bits/std_function.h:687
#5 0x0000555556472a2d in GenericSaveHandler::save_file (this=0x7fffffff9cb0)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/generic_save_handler.cc:108
#6 0x0000555556472f14 in GenericSaveHandler::save (this=0x7fffffff9cb0)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/generic_save_handler.cc:166
#7 0x00005555561484be in SaveHandler::save_game (this=0x7fffffffa910, game=...,
    complete_filename="save/2019-05-10T22.59.49.wgf", error_str=0x7fffffff9e90)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/save_handler.cc:253
#8 0x0000555555f7434e in WLApplication::emergency_save (game=...)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1482
#9 0x0000555555f73774 in WLApplication::load_game (this=0x555556d08150)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1384
#10 0x0000555555f722fe in WLApplication::mainmenu_singleplayer (this=0x555556d08150)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1207
#11 0x0000555555f71c2b in WLApplication::mainmenu (this=0x555556d08150)
    at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1109
#12 0x0000555555f6dfa7 in WLApplication::run (this=0x555556d08150)
    at /home/kaputtnik/Quellcode/widelands-r...

[kaputtnik (franku)]

Here is the save game: https://bugs.launchpad.net/widelands/+bug/1828627/+attachment/5262992/+files/wl_autosave_00.wgf

[GunChleoc (gunchleoc)]

Thanks, I can reproduce this.

[Toni Förster (stonerl)]

I get 2 compile warnings:

src/graphic/text/rt_render.cc:63:6: warning: no previous prototype for function 'replace_entities' [-Wmissing-prototypes]
void replace_entities(std::string* text) {

src/wui/building_statistics_menu.cc:41:15: warning: unused variable 'kTabHeight' [-Wunused-const-variable]
constexpr int kTabHeight = 35 + 5 * (kBuildGridCellHeight + kLabelHeight + kLabelHeight);

[GunChleoc (gunchleoc)]

Found the bug and fixed the compiler warnings :)

[Toni Förster (stonerl)]

Some problems in the lobby and multiplayer chat:

- The text in the input box is not centred
  (q,g, j and so on are cut off)
- Private messages double the prefix
- The @ in private message shouldn't be underlined
- There should either be no space before the @
  in private messages or an additional behind the @
  (as it is b20)
- If we have the space it should not be underlined
- The Username and the message look a little of
  (The message seems to be 2-4 pixels to high)

See this picture:

https://fosuta.org/pics/lua_chat.png

[Toni Förster (stonerl)]

=== modified file 'src/wui/game_chat_panel.cc'
--- src/wui/game_chat_panel.cc 2019-05-12 07:45:59 +0000
+++ src/wui/game_chat_panel.cc 2019-05-12 13:12:29 +0000
@@ -41,12 +41,12 @@
              0,
              0,
              w,
- h - 25,
+ h - 30,
              style,
              "",
              UI::Align::kLeft,
              UI::MultilineTextarea::ScrollMode::kScrollLogForced),
- editbox(this, 0, h - 20, w, style),
+ editbox(this, 0, h - 25, w, style),
      chat_message_counter(0),
      chat_sound(SoundHandler::register_fx(SoundType::kChat, "sound/lobby_chat")) {

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4953. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/531353166.
Appveyor build 4734. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_font_size_lua-4734.

[GunChleoc (gunchleoc)]

- The text in the input box is not centred
  (q,g, j and so on are cut off)

Thanks for the fix. The whole alignment code in the editbox should be overhauled sometime.

- Private messages double the prefix

Fixed

- The @ in private message shouldn't be underlined

Fixed

- There should either be no space before the @
  in private messages or an additional behind the @
  (as it is b20)

I did that on purpose. Mentions on Twitter and lots of modern messageboards etc. are always "@username", never "@ username".
No space before the @ would make it too hard to read-

- If we have the space it should not be underlined

Fixed

- The Username and the message look a little of
  (The message seems to be 2-4 pixels to high)

That's https://bugs.launchpad.net/widelands/+bug/1827544 and out of scope for this branch

[Toni Förster (stonerl)]

On more question. We have 2 different fonts now. The one used in editboxes is completely different from the other font. Is this intentionally?

[Toni Förster (stonerl)]

And one more. This is the handling of direct messages. I know this is branch is about fonts but maybe we can address this here.

Do we need:

sender @recepiant: text

For direct messages? The name is already coloured green and the text italic. This differentiates the message more than enough from normal messages IMHO.

For the sender:

@recepiant: text

For the recipient:

sender: text

This should be sufficient, IMHO.

[GunChleoc (gunchleoc)]

Good idea. I'd also like each player name to have the respective player's color, but this will need changing of the chat message protocol, because we only have 1 of the 2 player colors available there. So, not in this branch.

> On more question. We have 2 different fonts now. The one used in editboxes is completely different from the other font. Is this intentionally?

It's the same font. The only difference is that it's not bold. I think it looks better if we use bold fonts only for headings etc.

[Toni Förster (stonerl)]

In trunk admins are written in green in the client list. Did you remove this on purpose? If not, I'm going to post the patch the next comment,

[Toni Förster (stonerl)]

=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc 2019-05-13 06:04:34 +0000
+++ src/ui_fsmenu/internet_lobby.cc 2019-05-15 08:36:30 +0000
@@ -296,6 +296,8 @@
    case kClientSuperuser:
     pic = g_gr->images().get("images/wui/overlays/roadb_green.png");
     er.set_picture(0, pic);
+ er.set_color(RGBColor(0, 255, 0));
+ er.set_picture(0, pic);
     break;
    case kClientIRC:
     // No icon for IRC users

[GunChleoc (gunchleoc)]

That one fell victim to a merge conflict. I have added the style now :)

[Toni Förster (stonerl)]

LGTM :)

review: Approve

[GunChleoc (gunchleoc)]

Thanks a lot for the review!

@bunnybot merge

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5055. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/537329044.
Appveyor build 4835. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_font_size_lua-4835.

=== modified file 'data/templates/default/init.lua'
--- data/templates/default/init.lua	2017-06-14 06:40:42 +0000
+++ data/templates/default/init.lua	2019-05-26 02:00:17 +0000
@@ -1,7 +1,15 @@
 -- This script defines a GUI style for Widelands. At the moment, we only
 -- support the default template.
--- So far, only background textures and colors can be defined, and they all have
--- the format { image = filename, color = {r, g, b } }.
+
+-- Background textures and colors have the format { image = filename, color = {r, g, b } }.
+
+-- Required parameters for font styles are:
+-- * face: string
+-- * color: table with r, g, b values as int
+-- * size: positive int
+-- Optional bools are: bold, italic, underline, shadow
+
+-- Some elements carry custom parameters like e.g. "margin" that should be expanded upon in the future.
 
 dirname = path.dirname(__file__)
 
@@ -17,43 +25,222 @@
 local wui_green =  {3, 15, 0}
 local wui_brown =  {32, 19, 8}
 
+local fs_font_color = {255, 255, 0}
+local fs_font_face = "sans"
+local fs_font_size = 14
+
+local wui_font_color = {255, 255, 0}
+local wui_font_face = "sans"
+local wui_font_size = 14
+
+local default_ui_font = {
+   color = fs_font_color,
+   face = fs_font_face,
+   size = fs_font_size,
+   bold = true,
+   shadow = true
+}
+
+local default_button_fonts = {
+   enabled = default_ui_font,
+   disabled = {
+         color = {127, 127, 127},
+         face = fs_font_face,
+         size = fs_font_size,
+         bold = true,
+         shadow = true
+   },
+}
+
+local productivity_colors = {
+   low = {187, 0, 0},
+   medium = {255, 225, 30},
+   high = {0, 187, 0},
+}
+
 -- These are the style definitions to be returned.
 -- Note: you have to keep all the keys intact, or Widelands will not be happy.
 return {
-   -- Button backgrounds
+   -- Automatic resizing of fonts to make them fit onto buttons etc.
+   -- won't go below this size
+   minimum_font_size = 10,
+   minimap_icon_frame = fs_font_color,
+
+   -- Buttons
    buttons = {
       -- Buttons used in Fullscreen menus
       fsmenu = {
          -- Main menu ("Single Player", "Watch Replay", ...)
-         menu = { image = fs_button, color = fs_blue },
+         menu = {
+            enabled = {
+               font = default_button_fonts["enabled"],
+               background = {
+                  image = fs_button,
+                  color = fs_blue,
+               }
+            },
+            disabled = {
+               font = default_button_fonts["disabled"],
+               background = {
+                  image = fs_button,
+                  color = fs_blue,
+               }
+            }
+         },
          -- Primary user selection ("OK", ...)
-         primary = { image = fs_button, color = fs_green },
+         primary = {
+            enabled = {
+               font = default_button_fonts["enabled"],
+               background = {
+                  image = fs_button,
+                  color = fs_green,
+               }
+            },
+            disabled = {
+               font = default_button_fonts["disabled"],
+               background = {
+                  image = fs_button,
+                  color = fs_green,
+               }
+            }
+         },
          -- Secondary user selection ("Cancel", "Delete", selection buttons, ...)
-         secondary = { image = fs_button, color = fs_brown },
+         secondary = {
+            enabled = {
+               font = default_button_fonts["enabled"],
+               background = {
+                  image = fs_button,
+                  color = fs_brown,
+               }
+            },
+            disabled = {
+               font = default_button_fonts["disabled"],
+               background = {
+                  image = fs_button,
+                  color = fs_brown,
+               }
+            }
+         },
       },
       -- Buttons used in-game and in the editor
       wui = {
          -- Main menu ("Exit Game"), Building Windows, selection buttons, ...
-         menu = { image = wui_button, color = wui_light },
+         menu = {
+            enabled = {
+               font = default_button_fonts["enabled"],
+               background = {
+                  image = wui_button,
+                  color = wui_light,
+               }
+            },
+            disabled = {
+               font = default_button_fonts["disabled"],
+               background = {
+                  image = wui_button,
+                  color = wui_light,
+               }
+            }
+         },
          -- Primary user selection ("OK", attack, ...)
-         primary = { image = wui_button, color = wui_green },
+         primary = {
+            enabled = {
+               font = default_button_fonts["enabled"],
+               background = {
+                  image = wui_button,
+                  color = wui_green,
+               }
+            },
+            disabled = {
+               font = default_button_fonts["disabled"],
+               background = {
+                  image = wui_button,
+                  color = wui_green,
+               }
+            }
+         },
          -- Secondary user selection ("Cancel", "Delete", ...)
-         secondary = { image = wui_button, color = wui_brown },
+         secondary = {
+            enabled = {
+               font = default_button_fonts["enabled"],
+               background = {
+                  image = wui_button,
+                  color = wui_brown,
+               }
+            },
+            disabled = {
+               font = default_button_fonts["disabled"],
+               background = {
+                  image = wui_button,
+                  color = wui_brown,
+               }
+            }
+         },
          -- Building buttons on fieldaction and building statistics need to be
          -- transparent in order to match the background of the tab panel.
-         building_stats = { image = "", color = {0, 0, 0} },
+         building_stats = {
+            enabled = {
+               font = default_button_fonts["enabled"],
+               background = {
+                  image = "",
+                  color = {0, 0, 0},
+               }
+            },
+            disabled = {
+               font = default_button_fonts["disabled"],
+               background = {
+                  image = "",
+                  color = {0, 0, 0},
+               }
+            }
+         },
       }
    },
    -- Slider cursors (Sound control, attack, statistics, ...)
    sliders = {
       fsmenu = {
-         menu = { image = fs_button, color = fs_blue },
+         menu = {
+            background = {
+               image = fs_button,
+               color = fs_blue,
+            },
+            font = {
+               color = fs_font_color,
+               face = "condensed",
+               size = 11,
+               bold = true,
+               shadow = true
+            }
+         }
       },
       wui = {
          -- Sound Options, Statistics
-         light = { image = wui_button, color = wui_brown },
+         light = {
+            background = {
+               image = wui_button,
+               color = wui_brown,
+            },
+            font = {
+               color = fs_font_color,
+               face = "condensed",
+               size = 11,
+               bold = true,
+               shadow = true
+            }
+         },
          -- Fieldaction (attack)
-         dark = { image = wui_button, color = wui_green },
+         dark = {
+            background = {
+               image = wui_button,
+               color = wui_green,
+            },
+            font = {
+               color = fs_font_color,
+               face = "condensed",
+               size = 11,
+               bold = true,
+               shadow = true
+            }
+         },
       }
    },
    -- Background for tab panels
@@ -74,11 +261,31 @@
    -- Used both for one-line and multiline edit boxes
    editboxes = {
       fsmenu = {
-         menu = { image = fs_button, color = fs_green },
+         background = {
+            image = fs_button,
+            color = fs_green,
+            margin = 4
+         },
+         font = {
+            color = fs_font_color,
+            face = fs_font_face,
+            size = fs_font_size,
+            shadow = true
+         },
       },
       wui = {
-         menu = { image = wui_button, color = wui_brown },
-      }
+         background = {
+            image = wui_button,
+            color = wui_brown,
+            margin = 2,
+         },
+         font = {
+            color = wui_font_color,
+            face = wui_font_face,
+            size = wui_font_size,
+            shadow = true
+         },
+      },
    },
    -- Background for dropdown menus
    dropdowns = {
@@ -97,5 +304,381 @@
       wui = {
          menu = { image = wui_button, color = wui_brown },
       }
-   }
+   },
+
+   -- In-game statistics plots
+   statistics_plot = {
+      fonts = {
+         x_tick = {
+            color = { 255, 0, 0 },
+            face = "condensed",
+            size = 13,
+         },
+         y_min_value = {
+            color = { 125, 0, 0 },
+            face = "condensed",
+            size = 13,
+         },
+         y_max_value = {
+            color = { 60, 125, 0 },
+            face = "condensed",
+            size = 13,
+         },
+      },
+      colors = {
+         axis_line = { 0, 0, 0 },
+         zero_line = { 255, 255, 255 },
+      }
+   },
+
+   -- Map census and statistics, and building statistics window
+   building_statistics = {
+      census_font = {
+         color = wui_font_color, -- Default color
+         face = "condensed",
+         size = wui_font_size,
+         bold = true,
+         shadow = true
+      },
+      statistics_font = {
+         color = wui_font_color, -- Default color
+         face = "condensed",
+         size = wui_font_size,
+         bold = true,
+         shadow = true
+      },
+      -- Building statistics window
+      statistics_window = {
+         fonts = {
+            button_font = {
+               color = wui_font_color, -- Default color
+               face = "condensed",
+               size = 12, -- Do not make this bigger - the UI element size is still hard-coded.
+               bold = true,
+               shadow = true
+            },
+            details_font = {
+               color = wui_font_color, -- Default color
+               face = "sans",
+               size = 12, -- Do not make this bigger - the UI element size is still hard-coded.
+               bold = true,
+               shadow = true
+            },
+         },
+         editbox_margin = 0
+      },
+      colors = {
+         construction = { 163, 144, 19 },
+         neutral = { 255, 250, 170 },
+         low = productivity_colors["low"],
+         medium = productivity_colors["medium"],
+         high = productivity_colors["high"],
+      }
+   },
+
+   progressbar = {
+      fsmenu = {
+         font = {
+            color = { 128, 128, 255 },
+            face = fs_font_face,
+            size = fs_font_size,
+            bold = true,
+            shadow = true
+         },
+         background_colors = {
+            low = { 64, 64, 0 }, -- Unused
+            medium = { 64, 64, 0 },
+            high = { 64, 64, 0 }, -- Unused
+         }
+      },
+      wui = {
+         font = {
+            color = {255, 250, 170},
+            face = wui_font_face,
+            size = wui_font_size,
+            bold = true,
+            shadow = true
+         },
+         background_colors = {
+            low = productivity_colors["low"],
+            medium = productivity_colors["medium"],
+            high = productivity_colors["high"],
+         }
+      }
+   },
+
+   tables = {
+      fsmenu = {
+         enabled = {
+            color = fs_font_color,
+            face = fs_font_face,
+            size = fs_font_size,
+            bold = true,
+            shadow = true
+         },
+         disabled = {
+            color = {127, 127, 127},
+            face = fs_font_face,
+            size = fs_font_size,
+            bold = true,
+            shadow = true
+         }
+      },
+      wui = {
+         enabled = {
+            color = fs_font_color,
+            face = fs_font_face,
+            size = fs_font_size,
+            bold = true,
+            shadow = true
+         },
+         disabled = {
+            color = {127, 127, 127},
+            face = fs_font_face,
+            size = fs_font_size,
+            bold = true,
+            shadow = true
+         }
+      },
+   },
+
+   wareinfo = {
+      -- TODO(GunChleoc): This design is ugly.
+      -- Group stuff more logically once everything has been styled.
+      normal = {
+         fonts = {
+            header = {
+               color = wui_font_color,
+               face = "sans",
+               size = 11,
+            },
+            info = {
+               color = wui_font_color,
+               face = "condensed",
+               size = 10,
+            },
+         },
+         colors = {
+            icon_frame = { 69, 69, 69 },
+            icon_background = { 69, 69, 69 },
+            info_background = { 0, 0, 0 },
+         },
+         icon_background_image = "images/wui/ware_list_bg.png",
+      },
+      highlight = {
+         fonts = {
+            header = {
+               color = wui_font_color,
+               face = "sans",
+               size = 11,
+            },
+            info = {
+               color = wui_font_color,
+               face = "condensed",
+               size = 10,
+            },
+         },
+         colors = {
+            icon_frame = {255, 255, 0},
+            icon_background = {69, 69, 69},
+            info_background = {0, 0, 0},
+         },
+         icon_background_image = "images/wui/ware_list_bg_selected.png",
+      }
+   },
+
+   -- Font styles. Required parameters are:
+   -- * face: string
+   -- * color: table with r, g, b values as int
+   -- * size: positive int
+   -- Optional bools are: bold, italic, underline, shadow
+   fonts = {
+      -- Basic chat message text color
+      chat_message = {
+         color = wui_font_color,
+         face = "serif",
+         size = fs_font_size,
+         shadow = true,
+      },
+      -- Basic chat message text color
+      chat_timestamp = {
+         color = { 51, 255, 51 },
+         face = "serif",
+         size = 9,
+         shadow = true,
+      },
+      -- Chat for private messages
+      chat_whisper = {
+         color = { 238, 238, 238 },
+         face = "serif",
+         size = fs_font_size,
+         italic = true,
+         shadow = true,
+      },
+      -- Chat playername highlight
+      chat_playername = {
+         color = { 255, 255, 255 },
+         face = "serif",
+         size = fs_font_size,
+         bold = true,
+         shadow = true,
+      },
+      -- Chat log messages color. Also doubles as spectator playercolor for chat messages.
+      chat_server = {
+         color = { 221, 221, 221 },
+         face = "serif",
+         size = fs_font_size,
+         bold = true,
+         shadow = true,
+      },
+      -- Intro screen
+      fsmenu_intro = {
+         color = { 192, 192, 128 },
+         face = fs_font_face,
+         size = 16,
+         bold = true,
+         shadow = true
+      },
+      -- Displayed in the loading screens
+      fsmenu_gametip = {
+         color = { 33, 33, 27 },
+         face = "serif",
+         size = 16,
+      },
+      -- Game and Map info panels
+      fsmenu_info_panel_heading = {
+         color = { 255, 255, 0 },
+         face = fs_font_face,
+         size = fs_font_size,
+         bold = true,
+         shadow = true
+      },
+      fsmenu_info_panel_paragraph = {
+         color = { 209, 209, 209 },
+         face = fs_font_face,
+         size = fs_font_size,
+         shadow = true
+      },
+      -- Internet lobby and launch game
+      fsmenu_game_setup_headings = {
+         color = { 0, 255, 0 },
+         face = fs_font_face,
+         size = fs_font_size,
+         bold = true,
+         shadow = true
+      },
+      fsmenu_game_setup_mapname = {
+         color = { 255, 255, 127 },
+         face = fs_font_face,
+         size = fs_font_size,
+         bold = true,
+         shadow = true
+      },
+      -- List admin in the internet lobby
+      fsmenu_game_setup_superuser = {
+         color = { 0, 255, 0 },
+         face = fs_font_face,
+         size = fs_font_size,
+         bold = true,
+         shadow = true
+      },
+      -- List IRC clients in the internet lobby
+      fsmenu_game_setup_irc_client = {
+         color = { 221, 221, 221 },
+         face = fs_font_face,
+         size = fs_font_size,
+         bold = true,
+         shadow = true
+      },
+      -- Page titles. Also used in game summary TODO(GunChleoc): Refactor game summary
+      fsmenu_title = {
+         color = fs_font_color,
+         face = fs_font_face,
+         size = 22,
+         bold = true,
+         shadow = true
+      },
+      -- Make font a bit smaller so the link will fit at 800x600 resolution.
+      fsmenu_translation_info = {
+         color = fs_font_color,
+         face = fs_font_face,
+         size = fs_font_size - 2,
+         bold = true,
+         shadow = true
+      },
+
+      -- Textarea default style, also used for sliders, checkboxes, both in fsmenu and wui ...
+      label = default_ui_font,
+      tooltip = {
+         color = fs_font_color,
+         face = fs_font_face,
+         size = 14,
+         bold = false,
+      },
+      tooltip_header = {
+         color = fs_font_color,
+         face = fs_font_face,
+         size = 16,
+         bold = true,
+      },
+      warning = {
+         color = {255, 22, 22},
+         face = fs_font_face,
+         size = fs_font_size,
+         bold = true,
+         shadow = true
+      },
+      disabled = {
+         color = {127, 127, 127},
+         face = fs_font_face,
+         size = fs_font_size,
+         bold = true,
+         shadow = true
+      },
+
+      wui_attack_box_slider_label = {
+         color = wui_font_color,
+         face = wui_font_face,
+         size = 10,
+         bold = true,
+         shadow = true
+      },
+      wui_info_panel_heading = {
+         color = { 209, 209, 209 },
+         face = wui_font_face,
+         size = wui_font_size,
+         bold = true,
+      },
+      wui_info_panel_paragraph = {
+         color = { 255, 255, 0 },
+         face = wui_font_face,
+         size = wui_font_size,
+      },
+      -- Messages
+      wui_message_heading = {
+         color = { 209, 209, 209 },
+         face = wui_font_face,
+         size = 18,
+         bold = true,
+      },
+      wui_message_paragraph = {
+         color = { 255, 255, 0 },
+         face = wui_font_face,
+         size = 12,
+      },
+      wui_window_title = {
+         color = fs_font_color,
+         face = wui_font_face,
+         size = 13,
+         bold=true,
+         shadow=true,
+      },
+      wui_game_speed_and_coordinates = {
+         color = wui_font_color,
+         face = "condensed",
+         size = wui_font_size,
+         bold = true,
+         shadow = true
+      },
+   },
 }
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2019-05-05 18:53:14 +0000
+++ src/CMakeLists.txt	2019-05-26 02:00:17 +0000
@@ -107,7 +107,6 @@
     graphic
     graphic_fonthandler
     graphic_text
-    graphic_text_constants
     helper
     io_filesystem
     logic
 
=== modified file 'src/editor/tools/info_tool.cc'
--- src/editor/tools/info_tool.cc	2019-04-09 16:43:49 +0000
+++ src/editor/tools/info_tool.cc	2019-05-26 02:00:17 +0000
@@ -39,7 +39,8 @@
                                           EditorActionArgs* /* args */,
                                           Widelands::Map* map) {
 
-	static constexpr int kListFontsize = UI_FONT_SIZE_MESSAGE;
+	constexpr UI::FontStyle font_style = UI::FontStyle::kWuiInfoPanelParagraph;
+
 	parent.stop_painting();
 
 	UI::Window* const w =
@@ -53,7 +54,7 @@
 	std::string buf = as_heading(_("Node"), UI::PanelStyle::kWui, true);
 	buf += as_listitem(
 	   (boost::format(_("Coordinates: (%1$i, %2$i)")) % center.node.x % center.node.y).str(),
-	   kListFontsize);
+	   font_style);
 
 	std::vector<std::string> caps_strings;
 	Widelands::NodeCaps const caps = f.nodecaps();
@@ -100,15 +101,15 @@
 	buf += as_listitem((boost::format(_("Caps: %s")) %
 	                    i18n::localize_list(caps_strings, i18n::ConcatenateWith::COMMA))
 	                      .str(),
-	                   kListFontsize);
+	                   font_style);
 
 	if (f.get_owned_by() > 0) {
 		buf += as_listitem(
 		   (boost::format(_("Owned by: Player %u")) % static_cast<unsigned int>(f.get_owned_by()))
 		      .str(),
-		   kListFontsize);
+		   font_style);
 	} else {
-		buf += as_listitem(_("Owned by: —"), kListFontsize);
+		buf += as_listitem(_("Owned by: —"), font_style);
 	}
 
 	// *** Terrain info
@@ -119,7 +120,7 @@
 	   center.triangle.t == Widelands::TriangleIndex::D ? tf.terrain_d() : tf.terrain_r());
 
 	buf += as_listitem(
-	   (boost::format(pgettext("terrain_name", "Name: %s")) % ter.descname()).str(), kListFontsize);
+	   (boost::format(pgettext("terrain_name", "Name: %s")) % ter.descname()).str(), font_style);
 
 	std::vector<std::string> terrain_is_strings;
 	for (const Widelands::TerrainDescription::Type& terrain_type : ter.get_types()) {
@@ -132,10 +133,10 @@
 	   (boost::format(_("Is: %s")) %
 	    i18n::localize_list(terrain_is_strings, i18n::ConcatenateWith::AMPERSAND))
 	      .str(),
-	   kListFontsize);
+	   font_style);
 	buf += as_listitem(
 	   (boost::format(_("Editor Category: %s")) % ter.editor_category()->descname()).str(),
-	   kListFontsize);
+	   font_style);
 
 	// *** Map Object info
 	const Widelands::BaseImmovable* immovable = f.get_immovable();
@@ -146,7 +147,7 @@
 		if (immovable) {
 			buf +=
 			   as_listitem((boost::format(_("Immovable: %s")) % immovable->descr().descname()).str(),
-			               kListFontsize);
+			               font_style);
 		}
 
 		if (bob) {
@@ -179,19 +180,19 @@
 				buf += as_listitem((boost::format(_("Animals: %s")) %
 				                    i18n::localize_list(critternames, i18n::ConcatenateWith::COMMA))
 				                      .str(),
-				                   kListFontsize);
+				                   font_style);
 			}
 			if (!workernames.empty()) {
 				buf += as_listitem((boost::format(_("Workers: %s")) %
 				                    i18n::localize_list(workernames, i18n::ConcatenateWith::COMMA))
 				                      .str(),
-				                   kListFontsize);
+				                   font_style);
 			}
 			if (!shipnames.empty()) {
 				buf += as_listitem((boost::format(_("Ships: %s")) %
 				                    i18n::localize_list(shipnames, i18n::ConcatenateWith::COMMA))
 				                      .str(),
-				                   kListFontsize);
+				                   font_style);
 			}
 		}
 	}
@@ -204,28 +205,28 @@
 		   (boost::format(pgettext("resources", "%1%x %2%")) % static_cast<unsigned int>(ramount) %
 		    world.get_resource(f.get_resources())->descname())
 		      .str(),
-		   kListFontsize);
+		   font_style);
 	}
 
 	// *** Map info
 	buf += as_heading(_("Map"), UI::PanelStyle::kWui);
 	buf += as_listitem(
-	   (boost::format(pgettext("map_name", "Name: %s")) % map->get_name()).str(), kListFontsize);
+	   (boost::format(pgettext("map_name", "Name: %s")) % map->get_name()).str(), font_style);
 	buf += as_listitem(
 	   (boost::format(_("Size: %1% x %2%")) % map->get_width() % map->get_height()).str(),
-	   kListFontsize);
+	   font_style);
 
 	if (map->get_nrplayers() > 0) {
 		buf += as_listitem(
 		   (boost::format(_("Players: %u")) % static_cast<unsigned int>(map->get_nrplayers())).str(),
-		   kListFontsize);
+		   font_style);
 	} else {
-		buf += as_listitem(_("Players: –"), kListFontsize);
+		buf += as_listitem(_("Players: –"), font_style);
 	}
 
-	buf += as_listitem((boost::format(_("Author: %s")) % map->get_author()).str(), kListFontsize);
+	buf += as_listitem((boost::format(_("Author: %s")) % map->get_author()).str(), font_style);
 	buf += as_listitem(
-	   (boost::format(_("Description: %s")) % map->get_description()).str(), kListFontsize);
+	   (boost::format(_("Description: %s")) % map->get_description()).str(), font_style);
 
 	multiline_textarea->set_text(as_richtext(buf));
 
 
=== modified file 'src/editor/ui_menus/main_menu_load_or_save_map.cc'
--- src/editor/ui_menus/main_menu_load_or_save_map.cc	2019-04-18 16:50:35 +0000
+++ src/editor/ui_menus/main_menu_load_or_save_map.cc	2019-05-26 02:00:17 +0000
@@ -55,7 +55,7 @@
                   get_inner_w() - right_column_x_ - padding_,
                   tableh_,
                   UI::PanelStyle::kWui),
-     directory_info_(this, padding_, get_inner_h() - 2 * buth_ - 4 * padding_),
+     directory_info_(this, padding_, get_inner_h() - 2 * buth_ - 4 * padding_, 0, 0),
      ok_(this,
          "ok",
          UI::g_fh->fontset()->is_rtl() ? get_inner_w() / 2 - butw_ - padding_ :
 
=== modified file 'src/editor/ui_menus/main_menu_map_options.cc'
--- src/editor/ui_menus/main_menu_map_options.cc	2019-02-23 11:00:49 +0000
+++ src/editor/ui_menus/main_menu_map_options.cc	2019-05-26 02:00:17 +0000
@@ -28,6 +28,7 @@
 #include "editor/editorinteractive.h"
 #include "graphic/font_handler.h"
 #include "graphic/graphic.h"
+#include "graphic/text_layout.h"
 #include "logic/map.h"
 #include "ui_basic/editbox.h"
 #include "ui_basic/multilineeditbox.h"
@@ -45,7 +46,7 @@
    : UI::Window(&parent, "map_options", 0, 0, 350, parent.get_inner_h() - 80, _("Map Options")),
      padding_(4),
      indent_(10),
-     labelh_(text_height() + 4),
+     labelh_(text_height(UI::FontStyle::kLabel) + 4),
      checkbox_space_(25),
      butw_((get_inner_w() - 3 * padding_) / 2),
      max_w_(get_inner_w() - 2 * padding_),
@@ -72,8 +73,8 @@
      tags_box_(&tabs_, padding_, padding_, UI::Box::Vertical, max_w_, get_inner_h(), 0),
      teams_box_(&tabs_, padding_, padding_, UI::Box::Vertical, max_w_, get_inner_h(), 0),
 
-     name_(&main_box_, 0, 0, max_w_, 0, 2, UI::PanelStyle::kWui),
-     author_(&main_box_, 0, 0, max_w_, 0, 2, UI::PanelStyle::kWui),
+     name_(&main_box_, 0, 0, max_w_, UI::PanelStyle::kWui),
+     author_(&main_box_, 0, 0, max_w_, UI::PanelStyle::kWui),
      size_(&main_box_, 0, 0, max_w_ - indent_, labelh_, ""),
 
      teams_list_(
 
=== modified file 'src/editor/ui_menus/main_menu_random_map.cc'
--- src/editor/ui_menus/main_menu_random_map.cc	2019-04-24 07:09:29 +0000
+++ src/editor/ui_menus/main_menu_random_map.cc	2019-05-26 02:00:17 +0000
@@ -32,6 +32,7 @@
 #include "editor/editorinteractive.h"
 #include "editor/map_generator.h"
 #include "graphic/font_handler.h"
+#include "graphic/text_layout.h"
 #include "logic/editor_game_base.h"
 #include "logic/map.h"
 #include "logic/map_objects/world/world.h"
@@ -51,7 +52,7 @@
      // UI elements
      margin_(4),
      box_width_(get_inner_w() - 2 * margin_),
-     label_height_(text_height() + 2),
+     label_height_(text_height(UI::FontStyle::kLabel) + 2),
      box_(this, margin_, margin_, UI::Box::Vertical, 0, 0, margin_),
      // Size
      width_(&box_,
@@ -108,8 +109,8 @@
      resource_amount_(2),
      world_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
      resources_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
-     world_label_(&world_box_, 0, 0, _("Climate:")),
-     resources_label_(&resources_box_, 0, 0, _("Resources:")),
+     world_label_(&world_box_, 0, 0, 0, 0, _("Climate:")),
+     resources_label_(&resources_box_, 0, 0, 0, 0, _("Resources:")),
      world_(&world_box_,
             "world",
             0,
@@ -171,7 +172,7 @@
                 UI::SpinBox::Type::kSmall,
                 5),
      mountains_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
-     mountains_label_(&mountains_box_, 0, 0, _("Mountains:")),
+     mountains_label_(&mountains_box_, 0, 0, 0, 0, _("Mountains:")),
      mountains_(&mountains_box_,
                 0,
                 0,
@@ -182,22 +183,18 @@
      island_mode_(&box_, Vector2i::zero(), _("Island mode")),
      // Geeky stuff
      map_number_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
-     map_number_label_(&map_number_box_, 0, 0, _("Random number:")),
+     map_number_label_(&map_number_box_, 0, 0, 0, 0, _("Random number:")),
      map_number_edit_(&map_number_box_,
                       0,
                       0,
                       box_width_ - 2 * margin_ - map_number_label_.get_w(),
-                      0,
-                      2,
                       UI::PanelStyle::kWui),
      map_id_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
-     map_id_label_(&map_id_box_, 0, 0, _("Map ID:")),
+     map_id_label_(&map_id_box_, 0, 0, 0, 0, _("Map ID:")),
      map_id_edit_(&map_id_box_,
                   0,
                   0,
                   box_width_ - 2 * margin_ - map_id_label_.get_w(),
-                  0,
-                  2,
                   UI::PanelStyle::kWui),
      // Buttons
      button_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
 
=== modified file 'src/editor/ui_menus/main_menu_save_map.cc'
--- src/editor/ui_menus/main_menu_save_map.cc	2019-03-18 21:10:56 +0000
+++ src/editor/ui_menus/main_menu_save_map.cc	2019-05-26 02:00:17 +0000
@@ -83,7 +83,7 @@
 
 	editbox_ = new UI::EditBox(
 	   this, editbox_label_.get_x() + editbox_label_.get_w() + padding_, editbox_label_.get_y(),
-	   tablew_ - editbox_label_.get_w() - padding_ + 1, buth_, 2, UI::PanelStyle::kWui);
+	   tablew_ - editbox_label_.get_w() - padding_ + 1, UI::PanelStyle::kWui);
 	editbox_->set_text(parent.egbase().map().get_name());
 
 	editbox_->changed.connect(boost::bind(&MainMenuSaveMap::edit_box_changed, this));
 
=== modified file 'src/editor/ui_menus/main_menu_save_map_make_directory.cc'
--- src/editor/ui_menus/main_menu_save_map_make_directory.cc	2019-02-23 11:00:49 +0000
+++ src/editor/ui_menus/main_menu_save_map_make_directory.cc	2019-05-26 02:00:17 +0000
@@ -41,7 +41,7 @@
            get_inner_h() - 3 * padding_ - buth_,
            padding_ / 2),
      label_(&vbox_, 0, 0, get_inner_w() - 2 * padding_, buth_, _("Enter Directory Name:")),
-     edit_(&vbox_, 0, 0, get_inner_w() - 2 * padding_, 0, 4, UI::PanelStyle::kWui),
+     edit_(&vbox_, 0, 0, get_inner_w() - 2 * padding_, UI::PanelStyle::kWui),
      ok_button_(this,
                 "ok",
                 UI::g_fh->fontset()->is_rtl() ? padding_ : get_inner_w() - butw_ - padding_,
 
=== modified file 'src/editor/ui_menus/player_menu.cc'
--- src/editor/ui_menus/player_menu.cc	2019-02-27 19:00:36 +0000
+++ src/editor/ui_menus/player_menu.cc	2019-05-26 02:00:17 +0000
@@ -160,13 +160,11 @@
 		UI::Box* row = new UI::Box(&box_, 0, 0, UI::Box::Horizontal);
 
 		// Name
-		UI::EditBox* plr_name = new UI::EditBox(row, 0, 0, 0, 0, kMargin, UI::PanelStyle::kWui);
+		UI::EditBox* plr_name = new UI::EditBox(row, 0, 0, 0, UI::PanelStyle::kWui);
 		if (map_has_player) {
 			plr_name->set_text(map.get_scenario_player_name(p));
 		}
 		plr_name->changed.connect(boost::bind(&EditorPlayerMenu::name_changed, this, p - 1));
-		row->add(plr_name, UI::Box::Resizing::kFillSpace);
-		row->add_space(kMargin);
 
 		// Tribe
 		UI::Dropdown<std::string>* plr_tribe =
@@ -189,8 +187,6 @@
 		      "");
 		plr_tribe->selected.connect(
 		   boost::bind(&EditorPlayerMenu::player_tribe_clicked, boost::ref(*this), p - 1));
-		row->add(plr_tribe);
-		row->add_space(kMargin);
 
 		// Starting position
 		const Image* player_image =
@@ -204,8 +200,17 @@
 		   player_image, _("Set this player’s starting position"));
 		plr_position->sigclicked.connect(
 		   boost::bind(&EditorPlayerMenu::set_starting_pos_clicked, boost::ref(*this), p));
+
+		// Add the elements to the row
+		row->add(plr_name, UI::Box::Resizing::kFillSpace);
+		row->add_space(kMargin);
+
+		row->add(plr_tribe);
+		row->add_space(kMargin);
+
 		row->add(plr_position);
 
+		// Add the row itself
 		box_.add(row, UI::Box::Resizing::kFullSize);
 		box_.add_space(kMargin);
 		row->set_visible(map_has_player);
@@ -227,7 +232,7 @@
 	assert(!rows_.empty());
 	const Widelands::PlayerNumber nr_players = eia().egbase().map().get_nrplayers();
 	box_.set_size(310, no_of_players_.get_h() + kMargin +
-	                      nr_players * (rows_.front()->tribe->get_h() + kMargin));
+	                      nr_players * (rows_.front()->name->get_h() + kMargin));
 	set_inner_size(box_.get_w() + 2 * kMargin, box_.get_h() + 2 * kMargin);
 }
 
@@ -319,10 +324,10 @@
 	// Signal player position states via button states
 	iterate_player_numbers(pn, map->get_nrplayers()) {
 		if (pn == row) {
-			rows_.at(pn - 1)->position->set_background_style(UI::ButtonStyle::kWuiPrimary);
+			rows_.at(pn - 1)->position->set_style(UI::ButtonStyle::kWuiPrimary);
 			rows_.at(pn - 1)->position->set_perm_pressed(true);
 		} else {
-			rows_.at(pn - 1)->position->set_background_style(UI::ButtonStyle::kWuiSecondary);
+			rows_.at(pn - 1)->position->set_style(UI::ButtonStyle::kWuiSecondary);
 			rows_.at(pn - 1)->position->set_perm_pressed(map->get_starting_pos(pn) !=
 			                                             Widelands::Coords::null());
 		}
 
=== modified file 'src/editor/ui_menus/tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/tool_change_resources_options_menu.cc	2019-02-27 19:00:36 +0000
+++ src/editor/ui_menus/tool_change_resources_options_menu.cc	2019-05-26 02:00:17 +0000
@@ -73,7 +73,7 @@
              UI::SpinBox::Units::kNone,
              UI::SpinBox::Type::kSmall),
      resources_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, 1),
-     cur_selection_(&box_, 0, 0, "", UI::Align::kCenter) {
+     cur_selection_(&box_, 0, 0, 0, 0, "", UI::Align::kCenter) {
 	// Configure spin boxes
 	change_by_.set_tooltip(
 	   /** TRANSLATORS: Editor change rseources access keys. **/
 
=== modified file 'src/graphic/CMakeLists.txt'
--- src/graphic/CMakeLists.txt	2019-05-11 10:22:57 +0000
+++ src/graphic/CMakeLists.txt	2019-05-26 02:00:17 +0000
@@ -1,3 +1,4 @@
+add_subdirectory(styles)
 add_subdirectory(text)
 
 # TODO(sirver): Separate this directory into a base directory and one
@@ -5,20 +6,12 @@
 
 # Align and color
 
-
-wl_library(graphic_styles
-  SRCS
-    panel_styles.cc
-    panel_styles.h
-  DEPENDS
-    graphic_color
-    graphic_surface
-)
-
 wl_library(graphic_align
   SRCS
     align.h
     align.cc
+  DEPENDS
+    base_geometry
 )
 
 wl_library(graphic_color
@@ -269,12 +262,6 @@
     graphic_text
 )
 
-wl_library(graphic_text_constants
-  SRCS
-    text_constants.h
-    text_constants.cc
-)
-
 wl_library(graphic_text_layout
   SRCS
     text_layout.cc
@@ -284,8 +271,8 @@
     graphic_align
     graphic_color
     graphic_surface
+    graphic_styles
     graphic_text
-    graphic_text_constants
     graphic_fonthandler
     graphic_styles
 )
@@ -304,7 +291,6 @@
     graphic_color
     graphic_fonthandler
     graphic_text
-    graphic_text_constants
     graphic_text_layout
 )
 
@@ -343,7 +329,6 @@
     graphic_render_queue
     graphic_styles
     graphic_surface
-    graphic_text_layout
     io_filesystem
     io_stream
     logic_constants
@@ -355,3 +340,4 @@
     scripting_lua_table
     sound
 )
+
 
=== modified file 'src/graphic/align.cc'
--- src/graphic/align.cc	2019-02-23 11:00:49 +0000
+++ src/graphic/align.cc	2019-05-26 02:00:17 +0000
@@ -19,4 +19,51 @@
 
 #include "graphic/align.h"
 
-// Dummy
+namespace UI {
+
+/**
+ * Align pt horizontally to match align based on width w.
+ *
+ * When correcting for align, we never move from pixel boundaries to
+ * sub-pixels, because this might lead from pixel-perfect rendering to
+ * subsampled rendering - this can lead to blurry texts. That is why we
+ * never do float divisions in this function.
+ */
+void correct_for_align(Align align, uint32_t w, Vector2i* pt) {
+	if (align == Align::kCenter) {
+		pt->x -= w / 2;
+	} else if (align == Align::kRight) {
+		pt->x -= w;
+	}
+}
+
+/**
+ * Adjust the y coordinate in 'point 'pt' to vertically center an element with height 'h'.
+ */
+void center_vertically(uint32_t h, Vector2i* pt) {
+	pt->y -= h / 2;
+}
+
+
+/**
+ * This mirrors the horizontal alignment for RTL languages.
+ *
+ * Do not store this value as it is based on the global font setting.
+ */
+Align mirror_alignment(Align alignment, bool is_rtl) {
+	if (is_rtl) {
+		switch (alignment) {
+		case Align::kLeft:
+			alignment = Align::kRight;
+			break;
+		case Align::kRight:
+			alignment = Align::kLeft;
+			break;
+		case Align::kCenter:
+			break;
+		}
+	}
+	return alignment;
+}
+
+} // namespace UI
 
=== modified file 'src/graphic/align.h'
--- src/graphic/align.h	2019-02-23 11:00:49 +0000
+++ src/graphic/align.h	2019-05-26 02:00:17 +0000
@@ -20,6 +20,10 @@
 #ifndef WL_GRAPHIC_ALIGN_H
 #define WL_GRAPHIC_ALIGN_H
 
+#include <string>
+
+#include "base/vector.h"
+
 namespace UI {
 
 // TODO(GunChleoc): Step 1: Clean up superfluous usages of kLeft/kTop, especially with dalls to
@@ -33,5 +37,9 @@
 	kTop = kLeft,
 	kBottom = kRight,
 };
+
+void center_vertically(uint32_t h, Vector2i* pt);
+void correct_for_align(Align, uint32_t w, Vector2i* pt);
+Align mirror_alignment(Align alignment, bool is_rtl);
 }  // namespace UI
 #endif  // end of include guard: WL_GRAPHIC_ALIGN_H
 
=== modified file 'src/graphic/font_handler.cc'
--- src/graphic/font_handler.cc	2019-02-23 11:00:49 +0000
+++ src/graphic/font_handler.cc	2019-05-26 02:00:17 +0000
@@ -87,7 +87,7 @@
 		const std::string hash = boost::lexical_cast<std::string>(w) + text;
 		std::shared_ptr<const RenderedText> rendered_text = render_cache_->get(hash);
 		if (rendered_text == nullptr) {
-			rendered_text = render_cache_->insert(hash, rt_renderer_->render(text, w));
+			rendered_text = render_cache_->insert(hash, rt_renderer_->render(text, w, fontset()->is_rtl()));
 		}
 		return rendered_text;
 	}
 
=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc	2019-02-28 08:02:18 +0000
+++ src/graphic/graphic.cc	2019-05-26 02:00:17 +0000
@@ -35,7 +35,6 @@
 #include "graphic/render_queue.h"
 #include "graphic/rendertarget.h"
 #include "graphic/screen.h"
-#include "graphic/text_layout.h"
 #include "graphic/texture.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "io/streamwrite.h"
 
=== removed file 'src/graphic/panel_styles.cc'
--- src/graphic/panel_styles.cc	2017-06-12 11:07:47 +0000
+++ src/graphic/panel_styles.cc	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-// Dummy to make CMake happy
 
=== modified file 'src/graphic/rendertarget.cc'
--- src/graphic/rendertarget.cc	2019-04-24 06:32:02 +0000
+++ src/graphic/rendertarget.cc	2019-05-26 02:00:17 +0000
@@ -20,10 +20,10 @@
 #include "graphic/rendertarget.h"
 
 #include "base/macros.h"
+#include "graphic/align.h"
 #include "graphic/animation.h"
 #include "graphic/graphic.h"
 #include "graphic/surface.h"
-#include "graphic/text_layout.h"
 
 /**
  * Build a render target for the given surface.
 
=== modified file 'src/graphic/style_manager.cc'
--- src/graphic/style_manager.cc	2019-02-23 11:00:49 +0000
+++ src/graphic/style_manager.cc	2019-05-26 02:00:17 +0000
@@ -21,21 +21,55 @@
 
 #include <memory>
 
+#include <boost/format.hpp>
+
 #include "base/scoped_timer.h"
 #include "base/wexception.h"
 #include "graphic/graphic.h"
 #include "scripting/lua_interface.h"
 
 namespace {
-// Read image filename and RGB color from LuaTable
-UI::PanelStyleInfo* read_style(const LuaTable& table) {
+// Read RGB color from LuaTable
+RGBColor read_rgb_color(const LuaTable& table) {
+	std::vector<int> rgbcolor = table.array_entries<int>();
+	if (rgbcolor.size() != 3) {
+		throw wexception("Expected 3 entries for RGB color, but got %" PRIuS ".", rgbcolor.size());
+	}
+	return RGBColor(rgbcolor[0], rgbcolor[1], rgbcolor[2]);
+}
+
+// Read font style from LuaTable
+UI::FontStyleInfo* read_font_style(const LuaTable& parent_table, const std::string& table_key) {
+	std::unique_ptr<LuaTable> style_table = parent_table.get_table(table_key);
+	const int size = style_table->get_int("size");
+	if (size < 1) {
+		throw wexception("Font size %d too small for %s, must be at least 1!", size, table_key.c_str());
+	}
+	return new UI::FontStyleInfo(
+				style_table->get_string("face"),
+				read_rgb_color(*style_table->get_table("color")),
+				size,
+				style_table->has_key<std::string>("bold") ? style_table->get_bool("bold") : false,
+				style_table->has_key<std::string>("italic") ? style_table->get_bool("italic") : false,
+				style_table->has_key<std::string>("underline") ? style_table->get_bool("underline") : false,
+				style_table->has_key<std::string>("shadow") ? style_table->get_bool("shadow") : false);
+}
+
+// Read image filename and RGBA color from LuaTable
+UI::PanelStyleInfo* read_panel_style(const LuaTable& table) {
 	const std::string image = table.get_string("image");
 	std::vector<int> rgbcolor = table.get_table("color")->array_entries<int>();
 	if (rgbcolor.size() != 3) {
 		throw wexception("Expected 3 entries for RGB color, but got %" PRIuS ".", rgbcolor.size());
 	}
 	return new UI::PanelStyleInfo(image.empty() ? nullptr : g_gr->images().get(image),
-	                              RGBAColor(rgbcolor[0], rgbcolor[1], rgbcolor[2], 0));
+	                              RGBAColor(rgbcolor[0], rgbcolor[1], rgbcolor[2], 0),
+			table.has_key<std::string>("margin") ? table.get_int("margin") : 0);
+}
+
+// Read text panel style from LuaTable
+UI::TextPanelStyleInfo* read_text_panel_style(const LuaTable& table) {
+	return new UI::TextPanelStyleInfo(read_font_style(table, "font"), read_panel_style(*table.get_table("background")));
 }
 
 // Stupid completeness check - enum classes weren't meant for iterating, so we just compare the size
@@ -59,45 +93,34 @@
 	dropdownstyles_.clear();
 	scrollbarstyles_.clear();
 
-	log("Style Manager: Loading %sinit.lua ... ", kTemplateDir.c_str());
-
 	LuaInterface lua;
 	std::unique_ptr<LuaTable> table(lua.run_script(kTemplateDir + "init.lua"));
 
-	log("took %ums\n", timer.ms_since_last_query());
-	log("Style Manager: Reading button styles ... ");
-
 	// Buttons
 	std::unique_ptr<LuaTable> element_table = table->get_table("buttons");
 	std::unique_ptr<LuaTable> style_table = element_table->get_table("fsmenu");
-	add_button_style(UI::ButtonStyle::kFsMenuMenu, *style_table->get_table("menu").get());
-	add_button_style(UI::ButtonStyle::kFsMenuPrimary, *style_table->get_table("primary").get());
-	add_button_style(UI::ButtonStyle::kFsMenuSecondary, *style_table->get_table("secondary").get());
+	add_button_style(UI::ButtonStyle::kFsMenuMenu, *style_table->get_table("menu"));
+	add_button_style(UI::ButtonStyle::kFsMenuPrimary, *style_table->get_table("primary"));
+	add_button_style(UI::ButtonStyle::kFsMenuSecondary, *style_table->get_table("secondary"));
 	style_table = element_table->get_table("wui");
-	add_button_style(UI::ButtonStyle::kWuiMenu, *style_table->get_table("menu").get());
-	add_button_style(UI::ButtonStyle::kWuiPrimary, *style_table->get_table("primary").get());
-	add_button_style(UI::ButtonStyle::kWuiSecondary, *style_table->get_table("secondary").get());
+	add_button_style(UI::ButtonStyle::kWuiMenu, *style_table->get_table("menu"));
+	add_button_style(UI::ButtonStyle::kWuiPrimary, *style_table->get_table("primary"));
+	add_button_style(UI::ButtonStyle::kWuiSecondary, *style_table->get_table("secondary"));
 	add_button_style(
-	   UI::ButtonStyle::kWuiBuildingStats, *style_table->get_table("building_stats").get());
+	   UI::ButtonStyle::kWuiBuildingStats, *style_table->get_table("building_stats"));
 	check_completeness(
 	   "buttons", buttonstyles_.size(), static_cast<size_t>(UI::ButtonStyle::kWuiBuildingStats));
 
-	log("took %ums\n", timer.ms_since_last_query());
-	log("Style Manager: Reading slider styles ... ");
-
 	// Sliders
 	element_table = table->get_table("sliders");
 	style_table = element_table->get_table("fsmenu");
-	add_slider_style(UI::SliderStyle::kFsMenu, *style_table->get_table("menu").get());
+	add_slider_style(UI::SliderStyle::kFsMenu, *style_table->get_table("menu"));
 	style_table = element_table->get_table("wui");
-	add_slider_style(UI::SliderStyle::kWuiLight, *style_table->get_table("light").get());
-	add_slider_style(UI::SliderStyle::kWuiDark, *style_table->get_table("dark").get());
+	add_slider_style(UI::SliderStyle::kWuiLight, *style_table->get_table("light"));
+	add_slider_style(UI::SliderStyle::kWuiDark, *style_table->get_table("dark"));
 	check_completeness(
 	   "sliders", sliderstyles_.size(), static_cast<size_t>(UI::SliderStyle::kWuiDark));
 
-	log("took %ums\n", timer.ms_since_last_query());
-	log("Style Manager: Reading tabpanel styles ... ");
-
 	// Tabpanels
 	element_table = table->get_table("tabpanels");
 	style_table = element_table->get_table("fsmenu");
@@ -108,21 +131,13 @@
 	check_completeness(
 	   "tabpanels", tabpanelstyles_.size(), static_cast<size_t>(UI::TabPanelStyle::kWuiDark));
 
-	log("took %ums\n", timer.ms_since_last_query());
-	log("Style Manager: Reading editbox styles ... ");
-
 	// Editboxes
 	element_table = table->get_table("editboxes");
-	style_table = element_table->get_table("fsmenu");
-	add_style(UI::PanelStyle::kFsMenu, *style_table->get_table("menu").get(), &editboxstyles_);
-	style_table = element_table->get_table("wui");
-	add_style(UI::PanelStyle::kWui, *style_table->get_table("menu").get(), &editboxstyles_);
+	add_editbox_style(UI::PanelStyle::kFsMenu, *element_table->get_table("fsmenu"));
+	add_editbox_style(UI::PanelStyle::kWui, *element_table->get_table("wui"));
 	check_completeness(
 	   "editboxes", editboxstyles_.size(), static_cast<size_t>(UI::PanelStyle::kWui));
 
-	log("took %ums\n", timer.ms_since_last_query());
-	log("Style Manager: Reading dropdown styles ... ");
-
 	// Dropdowns
 	element_table = table->get_table("dropdowns");
 	style_table = element_table->get_table("fsmenu");
@@ -132,9 +147,6 @@
 	check_completeness(
 	   "dropdowns", dropdownstyles_.size(), static_cast<size_t>(UI::PanelStyle::kWui));
 
-	log("took %ums\n", timer.ms_since_last_query());
-	log("Style Manager: Reading scrollbar styles ... ");
-
 	// Scrollbars
 	element_table = table->get_table("scrollbars");
 	style_table = element_table->get_table("fsmenu");
@@ -144,18 +156,81 @@
 	check_completeness(
 	   "scrollbars", scrollbarstyles_.size(), static_cast<size_t>(UI::PanelStyle::kWui));
 
-	log("took %ums\n", timer.ms_since_last_query());
+	// Building statistics etc. for map objects
+	set_building_statistics_style(*table->get_table("building_statistics"));
+
+	// Progress bars
+	element_table = table->get_table("progressbar");
+	add_progressbar_style(UI::PanelStyle::kFsMenu, *element_table->get_table("fsmenu"));
+	add_progressbar_style(UI::PanelStyle::kWui, *element_table->get_table("wui"));
+	check_completeness(
+	   "progressbars", progressbar_styles_.size(), static_cast<size_t>(UI::PanelStyle::kWui));
+
+	// Table and listselect
+	element_table = table->get_table("tables");
+	add_table_style(UI::PanelStyle::kFsMenu, *element_table->get_table("fsmenu"));
+	add_table_style(UI::PanelStyle::kWui, *element_table->get_table("wui"));
+	check_completeness(
+	   "tables", table_styles_.size(), static_cast<size_t>(UI::PanelStyle::kWui));
+
+	// Statistics plot
+	set_statistics_plot_style(*table->get_table("statistics_plot"));
+
+	// Ware info in warehouses, construction actions etc.
+	element_table = table->get_table("wareinfo");
+	add_ware_info_style(UI::WareInfoStyle::kNormal, *element_table->get_table("normal"));
+	add_ware_info_style(UI::WareInfoStyle::kHighlight, *element_table->get_table("highlight"));
+	check_completeness(
+	   "wareinfos", ware_info_styles_.size(), static_cast<size_t>(UI::WareInfoStyle::kHighlight));
+
+	// Special elements
+	minimum_font_size_ = table->get_int("minimum_font_size");
+	if (minimum_font_size_ < 1) {
+		throw wexception("Font size too small for minimum_font_size, must be at least 1!");
+	}
+	minimap_icon_frame_ = read_rgb_color(*table->get_table("minimap_icon_frame"));
+
+	// Fonts
+	element_table = table->get_table("fonts");
+	add_font_style(UI::FontStyle::kChatMessage, *element_table, "chat_message");
+	add_font_style(UI::FontStyle::kChatPlayername, *element_table, "chat_playername");
+	add_font_style(UI::FontStyle::kChatServer, *element_table, "chat_server");
+	add_font_style(UI::FontStyle::kChatTimestamp, *element_table, "chat_timestamp");
+	add_font_style(UI::FontStyle::kChatWhisper, *element_table, "chat_whisper");
+	add_font_style(UI::FontStyle::kFsGameSetupHeadings, *element_table, "fsmenu_game_setup_headings");
+	add_font_style(UI::FontStyle::kFsGameSetupSuperuser, *element_table, "fsmenu_game_setup_superuser");
+	add_font_style(UI::FontStyle::kFsGameSetupIrcClient, *element_table, "fsmenu_game_setup_irc_client");
+	add_font_style(UI::FontStyle::kFsGameSetupMapname, *element_table, "fsmenu_game_setup_mapname");
+	add_font_style(UI::FontStyle::kFsMenuGameTip, *element_table, "fsmenu_gametip");
+	add_font_style(UI::FontStyle::kFsMenuInfoPanelHeading, *element_table, "fsmenu_info_panel_heading");
+	add_font_style(UI::FontStyle::kFsMenuInfoPanelParagraph, *element_table, "fsmenu_info_panel_paragraph");
+	add_font_style(UI::FontStyle::kFsMenuIntro, *element_table, "fsmenu_intro");
+	add_font_style(UI::FontStyle::kFsMenuTitle, *element_table, "fsmenu_title");
+	add_font_style(UI::FontStyle::kFsMenuTranslationInfo, *element_table, "fsmenu_translation_info");
+	add_font_style(UI::FontStyle::kDisabled, *element_table, "disabled");
+	add_font_style(UI::FontStyle::kLabel, *element_table, "label");
+	add_font_style(UI::FontStyle::kTooltipHeader, *element_table, "tooltip_header");
+	add_font_style(UI::FontStyle::kTooltip, *element_table, "tooltip");
+	add_font_style(UI::FontStyle::kWarning, *element_table, "warning");
+	add_font_style(UI::FontStyle::kWuiAttackBoxSliderLabel, *element_table, "wui_attack_box_slider_label");
+	add_font_style(UI::FontStyle::kWuiGameSpeedAndCoordinates, *element_table, "wui_game_speed_and_coordinates");
+	add_font_style(UI::FontStyle::kWuiInfoPanelHeading, *element_table, "wui_info_panel_heading");
+	add_font_style(UI::FontStyle::kWuiInfoPanelParagraph, *element_table, "wui_info_panel_paragraph");
+	add_font_style(UI::FontStyle::kWuiMessageHeading, *element_table, "wui_message_heading");
+	add_font_style(UI::FontStyle::kWuiMessageParagraph, *element_table, "wui_message_paragraph");
+	add_font_style(UI::FontStyle::kWuiWindowTitle, *element_table, "wui_window_title");
+	check_completeness("fonts", fontstyles_.size(), static_cast<size_t>(UI::FontStyle::kWuiWindowTitle));
 }
 
 // Return functions for the styles
-const UI::PanelStyleInfo* StyleManager::button_style(UI::ButtonStyle style) const {
+const UI::ButtonStyleInfo& StyleManager::button_style(UI::ButtonStyle style) const {
 	assert(buttonstyles_.count(style) == 1);
-	return buttonstyles_.at(style).get();
+	return *buttonstyles_.at(style);
 }
 
-const UI::PanelStyleInfo* StyleManager::slider_style(UI::SliderStyle style) const {
+const UI::TextPanelStyleInfo& StyleManager::slider_style(UI::SliderStyle style) const {
 	assert(sliderstyles_.count(style) == 1);
-	return sliderstyles_.at(style).get();
+	return *sliderstyles_.at(style);
 }
 
 const UI::PanelStyleInfo* StyleManager::tabpanel_style(UI::TabPanelStyle style) const {
@@ -163,9 +238,9 @@
 	return tabpanelstyles_.at(style).get();
 }
 
-const UI::PanelStyleInfo* StyleManager::editbox_style(UI::PanelStyle style) const {
+const UI::TextPanelStyleInfo& StyleManager::editbox_style(UI::PanelStyle style) const {
 	assert(editboxstyles_.count(style) == 1);
-	return editboxstyles_.at(style).get();
+	return *editboxstyles_.at(style);
 }
 
 const UI::PanelStyleInfo* StyleManager::dropdown_style(UI::PanelStyle style) const {
@@ -178,22 +253,143 @@
 	return scrollbarstyles_.at(style).get();
 }
 
+const UI::BuildingStatisticsStyleInfo& StyleManager::building_statistics_style() const {
+	return *building_statistics_style_;
+}
+
+const UI::ProgressbarStyleInfo& StyleManager::progressbar_style(UI::PanelStyle style) const {
+	assert(progressbar_styles_.count(style) == 1);
+	return *progressbar_styles_.at(style);
+}
+
+const UI::StatisticsPlotStyleInfo& StyleManager::statistics_plot_style() const {
+	return *statistics_plot_style_;
+}
+
+const UI::TableStyleInfo& StyleManager::table_style(UI::PanelStyle style) const {
+	assert(table_styles_.count(style) == 1);
+	return *table_styles_.at(style);
+}
+
+const UI::WareInfoStyleInfo& StyleManager::ware_info_style(UI::WareInfoStyle style) const {
+	assert(ware_info_styles_.count(style) == 1);
+	return *ware_info_styles_.at(style);
+}
+
+const UI::FontStyleInfo& StyleManager::font_style(UI::FontStyle style) const {
+	assert(fontstyles_.count(style) == 1);
+	return *fontstyles_.at(style);
+}
+
+int StyleManager::minimum_font_size() const {
+	return minimum_font_size_;
+}
+
+const RGBColor& StyleManager::minimap_icon_frame() const {
+	return minimap_icon_frame_;
+}
+
+std::string StyleManager::color_tag(const std::string& text, const RGBColor& color) {
+	static boost::format f("<font color=%s>%s</font>");
+	f % color.hex_value();
+	f % text;
+	return f.str();
+}
+
 // Fill the maps
 void StyleManager::add_button_style(UI::ButtonStyle style, const LuaTable& table) {
 	buttonstyles_.insert(
-	   std::make_pair(style, std::unique_ptr<UI::PanelStyleInfo>(read_style(table))));
+				std::make_pair(
+					style,
+					std::unique_ptr<const UI::ButtonStyleInfo>(
+						new UI::ButtonStyleInfo(
+							read_text_panel_style(*table.get_table("enabled")),
+							read_text_panel_style(*table.get_table("disabled"))))));
 }
 
 void StyleManager::add_slider_style(UI::SliderStyle style, const LuaTable& table) {
 	sliderstyles_.insert(
-	   std::make_pair(style, std::unique_ptr<UI::PanelStyleInfo>(read_style(table))));
-}
+	   std::make_pair(style, std::unique_ptr<UI::TextPanelStyleInfo>(read_text_panel_style(table))));
+}
+
+void StyleManager::add_editbox_style(UI::PanelStyle style, const LuaTable& table) {
+	editboxstyles_.insert(
+	   std::make_pair(style, std::unique_ptr<UI::TextPanelStyleInfo>(read_text_panel_style(table))));
+}
+
 
 void StyleManager::add_tabpanel_style(UI::TabPanelStyle style, const LuaTable& table) {
 	tabpanelstyles_.insert(
-	   std::make_pair(style, std::unique_ptr<UI::PanelStyleInfo>(read_style(table))));
+	   std::make_pair(style, std::unique_ptr<UI::PanelStyleInfo>(read_panel_style(table))));
+}
+
+void StyleManager::add_progressbar_style(UI::PanelStyle style, const LuaTable& table) {
+	std::unique_ptr<LuaTable> color_table = table.get_table("background_colors");
+	progressbar_styles_.insert(std::make_pair(
+								   style,
+								   std::unique_ptr<const UI::ProgressbarStyleInfo>(
+									   new UI::ProgressbarStyleInfo(
+										   read_font_style(table, "font"),
+										   read_rgb_color(*color_table->get_table("low")),
+										   read_rgb_color(*color_table->get_table("medium")),
+										   read_rgb_color(*color_table->get_table("high"))))));
+}
+
+void StyleManager::add_table_style(UI::PanelStyle style, const LuaTable& table) {
+	table_styles_.insert(std::make_pair(style,
+										std::unique_ptr<const UI::TableStyleInfo>(
+											new UI::TableStyleInfo(
+												read_font_style(table, "enabled"),
+												read_font_style(table, "disabled")))));
+}
+
+void StyleManager::set_statistics_plot_style(const LuaTable& table) {
+	std::unique_ptr<LuaTable> fonts_table = table.get_table("fonts");
+	std::unique_ptr<LuaTable> colors_table = table.get_table("colors");
+	statistics_plot_style_.reset(new UI::StatisticsPlotStyleInfo(
+				read_font_style(*fonts_table, "x_tick"),
+				read_font_style(*fonts_table, "y_min_value"),
+				read_font_style(*fonts_table, "y_max_value"),
+				read_rgb_color(*colors_table->get_table("axis_line")),
+				read_rgb_color(*colors_table->get_table("zero_line"))));
+}
+
+void StyleManager::set_building_statistics_style(const LuaTable& table) {
+	std::unique_ptr<LuaTable> window_table = table.get_table("statistics_window");
+	std::unique_ptr<LuaTable> colors_table = table.get_table("colors");
+	std::unique_ptr<LuaTable> fonts_table = window_table->get_table("fonts");
+	building_statistics_style_.reset(new UI::BuildingStatisticsStyleInfo(
+								read_font_style(*fonts_table, "button_font"),
+								read_font_style(*fonts_table, "details_font"),
+								window_table->get_int("editbox_margin"),
+								read_font_style(table, "census_font"),
+								read_font_style(table, "statistics_font"),
+								read_rgb_color(*colors_table->get_table("construction")),
+								read_rgb_color(*colors_table->get_table("neutral")),
+								read_rgb_color(*colors_table->get_table("low")),
+								read_rgb_color(*colors_table->get_table("medium")),
+								read_rgb_color(*colors_table->get_table("high"))));
+}
+
+void StyleManager::add_ware_info_style(UI::WareInfoStyle style, const LuaTable& table) {
+	std::unique_ptr<LuaTable> fonts_table = table.get_table("fonts");
+	std::unique_ptr<LuaTable> colors_table = table.get_table("colors");
+	ware_info_styles_.insert(
+				std::make_pair(style,
+							   std::unique_ptr<const UI::WareInfoStyleInfo>(
+								   new UI::WareInfoStyleInfo(
+									   read_font_style(*fonts_table, "header"),
+									   read_font_style(*fonts_table, "info"),
+									   g_gr->images().get(table.get_string("icon_background_image")),
+									   read_rgb_color(*colors_table->get_table("icon_frame")),
+									   read_rgb_color(*colors_table->get_table("icon_background")),
+									   read_rgb_color(*colors_table->get_table("info_background"))))));
 }
 
 void StyleManager::add_style(UI::PanelStyle style, const LuaTable& table, PanelStyleMap* map) {
-	map->insert(std::make_pair(style, std::unique_ptr<UI::PanelStyleInfo>(read_style(table))));
+	map->insert(std::make_pair(style, std::unique_ptr<UI::PanelStyleInfo>(read_panel_style(table))));
+}
+
+void StyleManager::add_font_style(UI::FontStyle font_key, const LuaTable& table, const std::string& table_key) {
+	fontstyles_.emplace(std::make_pair(font_key, std::unique_ptr<UI::FontStyleInfo>(read_font_style(table, table_key))));
 }
 
=== modified file 'src/graphic/style_manager.h'
--- src/graphic/style_manager.h	2019-02-23 11:00:49 +0000
+++ src/graphic/style_manager.h	2019-05-26 02:00:17 +0000
@@ -23,7 +23,15 @@
 #include <map>
 #include <memory>
 
-#include "graphic/panel_styles.h"
+#include "graphic/styles/building_statistics_style.h"
+#include "graphic/styles/button_style.h"
+#include "graphic/styles/font_style.h"
+#include "graphic/styles/panel_styles.h"
+#include "graphic/styles/progress_bar_style.h"
+#include "graphic/styles/statistics_plot_style.h"
+#include "graphic/styles/table_style.h"
+#include "graphic/styles/text_panel_style.h"
+#include "graphic/styles/ware_info_style.h"
 #include "scripting/lua_table.h"
 
 static const std::string kTemplateDir = "templates/default/";
@@ -36,27 +44,54 @@
 	// Late initialization, because Graphics needs to load the image files first.
 	void init();
 
-	const UI::PanelStyleInfo* button_style(UI::ButtonStyle) const;
-	const UI::PanelStyleInfo* slider_style(UI::SliderStyle) const;
+	const UI::BuildingStatisticsStyleInfo& building_statistics_style() const;
+	const UI::ButtonStyleInfo& button_style(UI::ButtonStyle) const;
+	const UI::TextPanelStyleInfo& slider_style(UI::SliderStyle) const;
 	const UI::PanelStyleInfo* tabpanel_style(UI::TabPanelStyle) const;
-	const UI::PanelStyleInfo* editbox_style(UI::PanelStyle) const;
+	const UI::TextPanelStyleInfo& editbox_style(UI::PanelStyle) const;
 	const UI::PanelStyleInfo* dropdown_style(UI::PanelStyle) const;
 	const UI::PanelStyleInfo* scrollbar_style(UI::PanelStyle) const;
+	const UI::ProgressbarStyleInfo& progressbar_style(UI::PanelStyle) const;
+	const UI::StatisticsPlotStyleInfo& statistics_plot_style() const;
+	const UI::TableStyleInfo& table_style(UI::PanelStyle) const;
+	const UI::WareInfoStyleInfo& ware_info_style(UI::WareInfoStyle) const;
+	const UI::FontStyleInfo& font_style(UI::FontStyle style) const;
+
+	// Special elements
+	int minimum_font_size() const;
+	const RGBColor& minimap_icon_frame() const;
+	static std::string color_tag(const std::string& text, const RGBColor& color);
 
 private:
 	using PanelStyleMap = std::map<UI::PanelStyle, std::unique_ptr<const UI::PanelStyleInfo>>;
 	void add_button_style(UI::ButtonStyle style, const LuaTable& table);
 	void add_slider_style(UI::SliderStyle style, const LuaTable& table);
+	void add_editbox_style(UI::PanelStyle style, const LuaTable& table);
 	void add_tabpanel_style(UI::TabPanelStyle style, const LuaTable& table);
+	void add_progressbar_style(UI::PanelStyle style, const LuaTable& table);
+	void add_table_style(UI::PanelStyle style, const LuaTable& table);
+	void set_statistics_plot_style(const LuaTable& table);
+	void set_building_statistics_style(const LuaTable& table);
+	void add_ware_info_style(UI::WareInfoStyle style, const LuaTable& table);
 	void add_style(UI::PanelStyle style, const LuaTable& table, PanelStyleMap* map);
+	void add_font_style(UI::FontStyle font, const LuaTable& table, const std::string& key);
 
-	std::map<UI::ButtonStyle, std::unique_ptr<const UI::PanelStyleInfo>> buttonstyles_;
-	std::map<UI::SliderStyle, std::unique_ptr<const UI::PanelStyleInfo>> sliderstyles_;
+	std::map<UI::ButtonStyle, std::unique_ptr<const UI::ButtonStyleInfo>> buttonstyles_;
+	std::map<UI::PanelStyle, std::unique_ptr<const UI::TextPanelStyleInfo>> editboxstyles_;
+	std::map<UI::SliderStyle, std::unique_ptr<const UI::TextPanelStyleInfo>> sliderstyles_;
 	std::map<UI::TabPanelStyle, std::unique_ptr<const UI::PanelStyleInfo>> tabpanelstyles_;
-	PanelStyleMap editboxstyles_;
 	PanelStyleMap dropdownstyles_;
 	PanelStyleMap scrollbarstyles_;
 
+	int minimum_font_size_;
+	RGBColor minimap_icon_frame_;
+	std::map<UI::FontStyle, std::unique_ptr<const UI::FontStyleInfo>> fontstyles_;
+	std::unique_ptr<const UI::BuildingStatisticsStyleInfo> building_statistics_style_;
+	std::map<UI::PanelStyle, std::unique_ptr<const UI::ProgressbarStyleInfo>> progressbar_styles_;
+	std::unique_ptr<const UI::StatisticsPlotStyleInfo> statistics_plot_style_;
+	std::map<UI::PanelStyle, std::unique_ptr<const UI::TableStyleInfo>> table_styles_;
+	std::map<UI::WareInfoStyle, std::unique_ptr<const UI::WareInfoStyleInfo>> ware_info_styles_;
+
 	DISALLOW_COPY_AND_ASSIGN(StyleManager);
 };
 
 
=== added directory 'src/graphic/styles'
=== added file 'src/graphic/styles/CMakeLists.txt'
--- src/graphic/styles/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/graphic/styles/CMakeLists.txt	2019-05-26 02:00:17 +0000
@@ -0,0 +1,18 @@
+wl_library(graphic_styles
+  SRCS
+    building_statistics_style.h
+    button_style.h
+    font_style.cc
+    font_style.h
+    panel_styles.h
+    progress_bar_style.h
+    text_panel_style.h
+    statistics_plot_style.h
+    table_style.h
+    ware_info_style.h
+  DEPENDS
+    base_exceptions
+    base_log
+    graphic_color
+    graphic_surface
+)
 
=== added file 'src/graphic/styles/building_statistics_style.h'
--- src/graphic/styles/building_statistics_style.h	1970-01-01 00:00:00 +0000
+++ src/graphic/styles/building_statistics_style.h	2019-05-26 02:00:17 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2018 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef WL_GRAPHIC_STYLES_BUILDING_STATISTICS_STYLE_H
+#define WL_GRAPHIC_STYLES_BUILDING_STATISTICS_STYLE_H
+
+#include <memory>
+
+#include "graphic/color.h"
+#include "graphic/styles/font_style.h"
+
+namespace UI {
+
+struct BuildingStatisticsStyleInfo {
+	explicit BuildingStatisticsStyleInfo(UI::FontStyleInfo* init_building_statistics_button_font,
+								UI::FontStyleInfo* init_building_statistics_details_font,
+								int init_editbox_margin,
+								UI::FontStyleInfo* init_census,
+								UI::FontStyleInfo* init_statistics,
+								const RGBColor& init_construction_color,
+								const RGBColor& init_neutral_color,
+								const RGBColor& init_low_color,
+								const RGBColor& init_medium_color,
+								const RGBColor& init_high_color) :
+		building_statistics_button_font_(init_building_statistics_button_font),
+		building_statistics_details_font_(init_building_statistics_details_font),
+		editbox_margin_(init_editbox_margin),
+		census_font_(init_census),
+		statistics_font_(init_statistics),
+		construction_color_(init_construction_color),
+		neutral_color_(init_neutral_color),
+		low_color_(init_low_color),
+		medium_color_(init_medium_color),
+		high_color_(init_high_color) {}
+
+	const UI::FontStyleInfo& building_statistics_button_font() const {
+		return *building_statistics_button_font_.get();
+	}
+	const UI::FontStyleInfo& building_statistics_details_font() const {
+		return *building_statistics_details_font_.get();
+	}
+	int editbox_margin() const {
+		return editbox_margin_;
+	}
+
+	const UI::FontStyleInfo& census_font() const {
+		return *census_font_.get();
+	}
+	const UI::FontStyleInfo& statistics_font() const {
+		return *statistics_font_.get();
+	}
+	const RGBColor& construction_color() const {
+		return construction_color_;
+	}
+	const RGBColor& neutral_color() const {
+		return neutral_color_;
+	}
+	const RGBColor& low_color() const {
+		return low_color_;
+	}
+	const RGBColor& medium_color() const {
+		return medium_color_;
+	}
+	const RGBColor& high_color() const {
+		return high_color_;
+	}
+
+private:
+	std::unique_ptr<const UI::FontStyleInfo> building_statistics_button_font_;
+	std::unique_ptr<const UI::FontStyleInfo> building_statistics_details_font_;
+	int editbox_margin_;
+	std::unique_ptr<const UI::FontStyleInfo> census_font_;
+	std::unique_ptr<const UI::FontStyleInfo> statistics_font_;
+	const RGBColor construction_color_;
+	const RGBColor neutral_color_;
+	const RGBColor low_color_;
+	const RGBColor medium_color_;
+	const RGBColor high_color_;
+};
+
+}  // namespace UI
+
+#endif  // end of include guard: WL_GRAPHIC_STYLES_BUILDING_STATISTICS_STYLE_H
 
=== added file 'src/graphic/styles/button_style.h'
--- src/graphic/styles/button_style.h	1970-01-01 00:00:00 +0000
+++ src/graphic/styles/button_style.h	2019-05-26 02:00:17 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2018 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef WL_GRAPHIC_STYLES_BUTTON_STYLE_H
+#define WL_GRAPHIC_STYLES_BUTTON_STYLE_H
+
+#include <memory>
+
+#include "graphic/styles/font_style.h"
+#include "graphic/styles/panel_styles.h"
+#include "graphic/styles/text_panel_style.h"
+
+namespace UI {
+
+enum class ButtonStyle {
+	kFsMenuMenu,
+	kFsMenuPrimary,
+	kFsMenuSecondary,
+	kWuiMenu,
+	kWuiPrimary,
+	kWuiSecondary,
+	kWuiBuildingStats
+};
+
+struct ButtonStyleInfo {
+	ButtonStyleInfo(const UI::TextPanelStyleInfo* init_enabled, const UI::TextPanelStyleInfo* init_disabled) :
+		enabled_(init_enabled),
+		disabled_(init_disabled) {
+	}
+	ButtonStyleInfo(const ButtonStyleInfo& other) :
+		enabled_(new UI::TextPanelStyleInfo(other.enabled())),
+		disabled_(new UI::TextPanelStyleInfo(other.disabled())) {
+	}
+
+	const UI::TextPanelStyleInfo& enabled() const {
+		return *enabled_.get();
+	}
+	const UI::TextPanelStyleInfo& disabled() const {
+		return *disabled_.get();
+	}
+
+private:
+	std::unique_ptr<const UI::TextPanelStyleInfo> enabled_;
+	std::unique_ptr<const UI::TextPanelStyleInfo> disabled_;
+};
+
+}  // namespace UI
+
+#endif  // end of include guard: WL_GRAPHIC_STYLES_BUTTON_STYLE_H
 
=== added file 'src/graphic/styles/font_style.cc'
--- src/graphic/styles/font_style.cc	1970-01-01 00:00:00 +0000
+++ src/graphic/styles/font_style.cc	2019-05-26 02:00:17 +0000
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2018 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "graphic/styles/font_style.h"
+
+#include <boost/format.hpp>
+
+#include "base/log.h"
+#include "base/wexception.h"
+
+namespace UI {
+
+FontStyleInfo::FontStyleInfo(const std::string& init_face, const RGBColor& init_color, int init_size,
+							 bool init_bold, bool init_italic, bool init_underline, bool init_shadow) :
+	face_(string_to_face(init_face)),
+	color_(init_color),
+	size_(init_size),
+	bold_(init_bold),
+	italic_(init_italic),
+	underline_(init_underline),
+	shadow_(init_shadow) {
+}
+
+FontStyleInfo::FontStyleInfo(const FontStyleInfo& other) :
+	face_(other.face()),
+	color_(other.color()),
+	size_(other.size()),
+	bold_(other.bold()),
+	italic_(other.italic()),
+	underline_(other.underline()),
+	shadow_(other.shadow())
+{}
+
+const std::string FontStyleInfo::face_to_string() const {
+	switch (face_) {
+	case Face::kSans:
+		return "sans";
+	case Face::kSerif:
+		return "serif";
+	case Face::kCondensed:
+		return "condensed";
+	}
+	return "sans";
+}
+
+FontStyleInfo::Face FontStyleInfo::string_to_face(const std::string& init_face) {
+	FontStyleInfo::Face result;
+	if (init_face == "sans") {
+		result = Face::kSans;
+	} else if (init_face == "serif") {
+		result = Face::kSerif;
+	} else if (init_face == "condensed") {
+		result = Face::kCondensed;
+	} else {
+		throw wexception("Unknown font face '%s', expected 'sans', 'serif' or 'condensed'", init_face.c_str());
+	}
+	return result;
+}
+
+std::string FontStyleInfo::as_font_tag(const std::string& text) const {
+	static boost::format f("<font face=%s size=%d color=%s%s>%s</font>");
+	std::string optionals = "";
+	if (bold_) {
+		optionals += " bold=1";
+	}
+	if (italic_) {
+		optionals += " italic=1";
+	}
+	if (shadow_) {
+		optionals += " shadow=1";
+	}
+	if (underline_) {
+		optionals += " underline=1";
+	}
+	f % face_to_string();
+	f % size_;
+	f % color_.hex_value();
+	f % optionals;
+	f % text;
+	return f.str();
+}
+
+FontStyleInfo::Face FontStyleInfo::face() const {
+	return face_;
+}
+void FontStyleInfo::make_condensed() {
+	face_ = Face::kCondensed;
+}
+const RGBColor& FontStyleInfo::color() const {
+	return color_;
+}
+void FontStyleInfo::set_color(const RGBColor& new_color) {
+	color_ = new_color;
+}
+int FontStyleInfo::size() const {
+	return size_;
+}
+void FontStyleInfo::set_size(int new_size) {
+	size_ = new_size;
+}
+bool FontStyleInfo::bold() const {
+	return bold_;
+}
+bool FontStyleInfo::italic() const {
+	return italic_;
+}
+bool FontStyleInfo::underline() const {
+	return underline_;
+}
+bool FontStyleInfo::shadow() const {
+	return shadow_;
+}
+
+} // namespace UI
 
=== added file 'src/graphic/styles/font_style.h'
--- src/graphic/styles/font_style.h	1970-01-01 00:00:00 +0000
+++ src/graphic/styles/font_style.h	2019-05-26 02:00:17 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2018 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef WL_GRAPHIC_STYLES_FONT_STYLE_H
+#define WL_GRAPHIC_STYLES_FONT_STYLE_H
+
+#include <string>
+
+#include "graphic/color.h"
+
+namespace UI {
+enum class FontStyle {
+	kChatMessage,
+   kChatPlayername,
+   kChatServer,
+   kChatTimestamp,
+   kChatWhisper,
+   kFsGameSetupHeadings,
+   kFsGameSetupIrcClient,
+	kFsGameSetupSuperuser,
+   kFsGameSetupMapname,
+   kFsMenuGameTip,
+   kFsMenuInfoPanelHeading,
+   kFsMenuInfoPanelParagraph,
+   kFsMenuIntro,
+	kFsMenuTitle,
+	kFsMenuTranslationInfo,
+	kDisabled,
+   kLabel,
+	kTooltipHeader,
+   kTooltip,
+   kWarning,
+	kWuiAttackBoxSliderLabel,
+   kWuiGameSpeedAndCoordinates,
+   kWuiInfoPanelHeading,
+   kWuiInfoPanelParagraph,
+   kWuiMessageHeading,
+   kWuiMessageParagraph,
+   kWuiWindowTitle
+};
+
+struct FontStyleInfo {
+	enum class Face { kSans, kSerif, kCondensed };
+
+	explicit FontStyleInfo(const std::string& init_face, const RGBColor& init_color, int init_size,
+						   bool init_bold, bool init_italic, bool init_underline, bool init_shadow);
+	explicit FontStyleInfo(const FontStyleInfo& other);
+	FontStyleInfo& operator=(const FontStyleInfo& other) = default;
+
+	std::string as_font_tag(const std::string& text) const;
+
+	Face face() const;
+	void make_condensed();
+
+	const RGBColor& color() const;
+	void set_color(const RGBColor& new_color);
+
+	int size() const;
+	void set_size(int new_size);
+
+	bool bold() const;
+	bool italic() const;
+	bool underline() const;
+	bool shadow() const;
+
+private:
+	static Face string_to_face(const std::string& face_);
+	const std::string face_to_string() const;
+
+	Face face_;
+	RGBColor color_;
+	int size_;
+	const bool bold_;
+	const bool italic_;
+	const bool underline_;
+	const bool shadow_;
+};
+
+}  // namespace UI
+
+#endif  // end of include guard: WL_GRAPHIC_STYLES_FONT_STYLE_H
 
=== renamed file 'src/graphic/panel_styles.h' => 'src/graphic/styles/panel_styles.h'
--- src/graphic/panel_styles.h	2019-02-23 11:00:49 +0000
+++ src/graphic/styles/panel_styles.h	2019-05-26 02:00:17 +0000
@@ -17,41 +17,47 @@
  *
  */
 
-#ifndef WL_GRAPHIC_PANEL_STYLES_H
-#define WL_GRAPHIC_PANEL_STYLES_H
+#ifndef WL_GRAPHIC_STYLES_PANEL_STYLES_H
+#define WL_GRAPHIC_STYLES_PANEL_STYLES_H
+
+#include <map>
+#include <memory>
 
 #include "graphic/color.h"
+#include "graphic/styles/font_style.h"
 #include "graphic/image.h"
 
 namespace UI {
 
-// Buttons
-enum class ButtonStyle {
-	kFsMenuMenu,
-	kFsMenuPrimary,
-	kFsMenuSecondary,
-	kWuiMenu,
-	kWuiPrimary,
-	kWuiSecondary,
-	kWuiBuildingStats
-};
-enum class SliderStyle { kFsMenu, kWuiLight, kWuiDark };
-
 // Backgrounds
 enum class PanelStyle { kFsMenu, kWui };
 enum class TabPanelStyle { kFsMenu, kWuiLight, kWuiDark };
 
 struct PanelStyleInfo {
-	PanelStyleInfo(const Image* init_image, const RGBAColor& init_color)
-	   : image(init_image), color(init_color) {
-	}
-	PanelStyleInfo() : PanelStyleInfo(nullptr, RGBAColor(0, 0, 0, 0)) {
-	}
-
-	const Image* image;
-	const RGBAColor color;
+	PanelStyleInfo(const Image* init_image, const RGBAColor& init_color, int init_margin)
+	   : margin_(init_margin), image_(init_image), color_(init_color) {
+	}
+	PanelStyleInfo(const PanelStyleInfo& other)
+	   : image_(other.image()), color_(other.color()) {
+	}
+
+	const RGBAColor& color() const {
+		return color_;
+	}
+	const Image* image() const {
+		return image_;
+	}
+
+	int margin() const {
+		return margin_;
+	}
+
+private:
+	int margin_;
+	const Image* image_;
+	RGBAColor color_;
 };
 
 }  // namespace UI
 
-#endif  // end of include guard: WL_GRAPHIC_PANEL_STYLES_H
+#endif  // end of include guard: WL_GRAPHIC_STYLES_PANEL_STYLES_H
 
=== added file 'src/graphic/styles/progress_bar_style.h'
--- src/graphic/styles/progress_bar_style.h	1970-01-01 00:00:00 +0000
+++ src/graphic/styles/progress_bar_style.h	2019-05-26 02:00:17 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2018 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef WL_GRAPHIC_STYLES_PROGRESS_BAR_STYLE_H
+#define WL_GRAPHIC_STYLES_PROGRESS_BAR_STYLE_H
+
+#include <memory>
+
+#include "graphic/color.h"
+#include "graphic/styles/font_style.h"
+
+namespace UI {
+
+struct ProgressbarStyleInfo {
+	explicit ProgressbarStyleInfo(UI::FontStyleInfo* init_font,
+								  const RGBColor& init_low_color,
+								  const RGBColor& init_medium_color,
+								  const RGBColor& init_high_color) :
+		font_(init_font),
+		low_color_(init_low_color),
+		medium_color_(init_medium_color),
+		high_color_(init_high_color) {}
+	explicit ProgressbarStyleInfo(const ProgressbarStyleInfo& other):
+		font_(new UI::FontStyleInfo(other.font())),
+		low_color_(other.low_color()),
+		medium_color_(other.medium_color()),
+		high_color_(other.high_color())
+	{
+	}
+
+	const UI::FontStyleInfo& font() const {
+		return *font_.get();
+	}
+	const RGBColor& low_color() const {
+		return low_color_;
+	}
+	const RGBColor& medium_color() const {
+		return medium_color_;
+	}
+	const RGBColor& high_color() const {
+		return high_color_;
+	}
+
+private:
+	std::unique_ptr<const UI::FontStyleInfo> font_;
+	const RGBColor low_color_;
+	const RGBColor medium_color_;
+	const RGBColor high_color_;
+};
+
+}  // namespace UI
+
+#endif  // end of include guard: WL_GRAPHIC_STYLES_PROGRESS_BAR_STYLE_H
 
=== added file 'src/graphic/styles/statistics_plot_style.h'
--- src/graphic/styles/statistics_plot_style.h	1970-01-01 00:00:00 +0000
+++ src/graphic/styles/statistics_plot_style.h	2019-05-26 02:00:17 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2018 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef WL_GRAPHIC_STYLES_STATISTICS_PLOT_STYLE_H
+#define WL_GRAPHIC_STYLES_STATISTICS_PLOT_STYLE_H
+
+#include <memory>
+
+#include "graphic/color.h"
+#include "graphic/styles/font_style.h"
+
+namespace UI {
+
+struct StatisticsPlotStyleInfo {
+	explicit StatisticsPlotStyleInfo(UI::FontStyleInfo* init_x_tick_font,
+									 UI::FontStyleInfo* init_y_min_value_font,
+									 UI::FontStyleInfo* init_y_max_value_font,
+									 const RGBColor& init_axis_line_color,
+									 const RGBColor& init_zero_line_color) :
+		x_tick_font_(init_x_tick_font),
+		y_min_value_font_(init_y_min_value_font),
+		y_max_value_font_(init_y_max_value_font),
+		axis_line_color_(init_axis_line_color),
+		zero_line_color_(init_zero_line_color) {}
+
+	const UI::FontStyleInfo& x_tick_font() const {
+		return *x_tick_font_.get();
+	}
+	const UI::FontStyleInfo& y_min_value_font() const {
+		return *y_min_value_font_.get();
+	}
+	const UI::FontStyleInfo& y_max_value_font() const {
+		return *y_max_value_font_.get();
+	}
+	const RGBColor& axis_line_color() const {
+		return axis_line_color_;
+	}
+	const RGBColor& zero_line_color() const {
+		return zero_line_color_;
+	}
+
+private:
+	std::unique_ptr<const UI::FontStyleInfo> x_tick_font_;
+	std::unique_ptr<const UI::FontStyleInfo> y_min_value_font_;
+	std::unique_ptr<const UI::FontStyleInfo> y_max_value_font_;
+	const RGBColor axis_line_color_;
+	const RGBColor zero_line_color_;
+};
+
+}  // namespace UI
+
+#endif  // end of include guard: WL_GRAPHIC_STYLES_STATISTICS_PLOT_STYLE_H
 
=== added file 'src/graphic/styles/table_style.h'
--- src/graphic/styles/table_style.h	1970-01-01 00:00:00 +0000
+++ src/graphic/styles/table_style.h	2019-05-26 02:00:17 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2018 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef WL_GRAPHIC_STYLES_TABLE_STYLE_H
+#define WL_GRAPHIC_STYLES_TABLE_STYLE_H
+
+#include <memory>
+
+#include "graphic/styles/font_style.h"
+
+namespace UI {
+
+struct TableStyleInfo {
+	explicit TableStyleInfo(UI::FontStyleInfo* init_enabled, UI::FontStyleInfo* init_disabled) :
+		enabled_(init_enabled), disabled_(init_disabled) {}
+
+	const UI::FontStyleInfo& enabled() const {
+		return *enabled_.get();
+	}
+	const UI::FontStyleInfo& disabled() const {
+		return *disabled_.get();
+	}
+
+private:
+	std::unique_ptr<const UI::FontStyleInfo> enabled_;
+	std::unique_ptr<const UI::FontStyleInfo> disabled_;
+};
+
+}  // namespace UI
+
+#endif  // end of include guard: WL_GRAPHIC_STYLES_TABLE_STYLE_H
 
=== added file 'src/graphic/styles/text_panel_style.h'
--- src/graphic/styles/text_panel_style.h	1970-01-01 00:00:00 +0000
+++ src/graphic/styles/text_panel_style.h	2019-05-26 02:00:17 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2018 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef WL_GRAPHIC_STYLES_TEXT_PANEL_STYLE_H
+#define WL_GRAPHIC_STYLES_TEXT_PANEL_STYLE_H
+
+#include <memory>
+
+#include "graphic/styles/font_style.h"
+#include "graphic/styles/panel_styles.h"
+
+namespace UI {
+
+enum class SliderStyle { kFsMenu, kWuiLight, kWuiDark };
+
+struct TextPanelStyleInfo {
+	explicit TextPanelStyleInfo(const UI::FontStyleInfo* init_font, const UI::PanelStyleInfo* init_background) :
+		background_(init_background),
+		font_(init_font) {
+	}
+	explicit TextPanelStyleInfo(const TextPanelStyleInfo& other) :
+		background_(new UI::PanelStyleInfo(other.background())),
+		font_(new UI::FontStyleInfo(other.font())) {
+	}
+	TextPanelStyleInfo& operator=(const TextPanelStyleInfo& other) = default;
+
+	const UI::FontStyleInfo& font() const {
+		return *font_.get();
+	}
+	void set_font(const UI::FontStyleInfo& new_font)  {
+		font_.reset(new UI::FontStyleInfo(new_font));
+	}
+
+	const UI::PanelStyleInfo& background() const {
+		return *background_.get();
+	}
+
+private:
+	std::unique_ptr<const UI::PanelStyleInfo> background_;
+	std::unique_ptr<const UI::FontStyleInfo> font_;
+};
+
+}  // namespace UI
+
+#endif  // end of include guard: WL_GRAPHIC_STYLES_TEXT_PANEL_STYLE_H
 
=== added file 'src/graphic/styles/ware_info_style.h'
--- src/graphic/styles/ware_info_style.h	1970-01-01 00:00:00 +0000
+++ src/graphic/styles/ware_info_style.h	2019-05-26 02:00:17 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2018 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef WL_GRAPHIC_STYLES_WARE_INFO_STYLE_H
+#define WL_GRAPHIC_STYLES_WARE_INFO_STYLE_H
+
+#include <memory>
+
+#include "graphic/color.h"
+#include "graphic/styles/font_style.h"
+#include "graphic/image.h"
+
+namespace UI {
+
+enum class WareInfoStyle {
+	kNormal,
+	kHighlight
+};
+
+struct WareInfoStyleInfo {
+	explicit WareInfoStyleInfo(UI::FontStyleInfo* init_header_font,
+							   UI::FontStyleInfo* init_info_font,
+							   const Image* init_icon_background_image,
+							   const RGBColor& init_icon_frame,
+							   const RGBColor& init_icon_background,
+							   const RGBColor& init_info_background) :
+		header_font_(init_header_font),
+		info_font_(init_info_font),
+		icon_background_image_(init_icon_background_image),
+		icon_frame_(init_icon_frame),
+		icon_background_(init_icon_background),
+		info_background_(init_info_background) {}
+
+	const UI::FontStyleInfo& header_font() const {
+		return *header_font_.get();
+	}
+	const UI::FontStyleInfo& info_font() const {
+		return *info_font_.get();
+	}
+	const Image* icon_background_image() const {
+		return icon_background_image_;
+	}
+	const RGBColor& icon_frame() const {
+		return icon_frame_;
+	}
+	const RGBColor& icon_background() const {
+		return icon_background_;
+	}
+	const RGBColor& info_background() const {
+		return info_background_;
+	}
+
+private:
+	std::unique_ptr<const UI::FontStyleInfo> header_font_;
+	std::unique_ptr<const UI::FontStyleInfo> info_font_;
+	const Image* icon_background_image_;
+	const RGBColor icon_frame_;
+	const RGBColor icon_background_;
+	const RGBColor info_background_;
+};
+
+}  // namespace UI
+
+#endif  // end of include guard: WL_GRAPHIC_STYLES_WARE_INFO_STYLE_H
 
=== modified file 'src/graphic/text/CMakeLists.txt'
--- src/graphic/text/CMakeLists.txt	2018-03-02 06:01:51 +0000
+++ src/graphic/text/CMakeLists.txt	2019-05-26 02:00:17 +0000
@@ -41,7 +41,6 @@
     graphic_playercolor
     graphic_sdl_utils
     graphic_surface
-    graphic_text_layout
     io_fileread
     io_filesystem
     scripting_lua_interface
 
=== modified file 'src/graphic/text/font_set.cc'
--- src/graphic/text/font_set.cc	2019-02-23 11:00:49 +0000
+++ src/graphic/text/font_set.cc	2019-05-26 02:00:17 +0000
@@ -27,6 +27,7 @@
 
 #include "base/i18n.h"
 #include "base/log.h"
+#include "graphic/text/bidi.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "scripting/lua_interface.h"
 #include "scripting/lua_table.h"
 
=== modified file 'src/graphic/text/font_set.h'
--- src/graphic/text/font_set.h	2019-02-23 11:00:49 +0000
+++ src/graphic/text/font_set.h	2019-05-26 02:00:17 +0000
@@ -25,6 +25,7 @@
 #include <string>
 
 #include "base/macros.h"
+#include "graphic/align.h"
 #include "scripting/lua_table.h"
 
 namespace UI {
@@ -32,8 +33,6 @@
 // Contains font information for a locale
 struct FontSet {
 
-	enum class Face { kSans, kSerif, kCondensed };
-
 	static constexpr const char* kFallbackFont = "DejaVu/DejaVuSans.ttf";
 
 	/// Create a fontset from i18n/fonts.lua
@@ -62,6 +61,7 @@
 	// Returns true iff the fontset's script is written from right to left.
 	bool is_rtl() const;
 
+
 private:
 	/// Parses font information for the given fontset name from Lua.
 	/// The fontset definitions are in i18n/fonts.lua
 
=== modified file 'src/graphic/text/rendered_text.cc'
--- src/graphic/text/rendered_text.cc	2019-02-23 11:00:49 +0000
+++ src/graphic/text/rendered_text.cc	2019-05-26 02:00:17 +0000
@@ -22,7 +22,6 @@
 #include <memory>
 
 #include "graphic/graphic.h"
-#include "graphic/text_layout.h"
 
 namespace UI {
 // RenderedRect
 
=== modified file 'src/graphic/text/rt_render.cc'
--- src/graphic/text/rt_render.cc	2019-05-04 09:59:51 +0000
+++ src/graphic/text/rt_render.cc	2019-05-26 02:00:17 +0000
@@ -48,11 +48,23 @@
 #include "graphic/text/rt_parse.h"
 #include "graphic/text/sdl_ttf_font.h"
 #include "graphic/text/textstream.h"
-#include "graphic/text_layout.h"
 #include "graphic/texture.h"
 #include "io/filesystem/filesystem_exceptions.h"
 #include "io/filesystem/layered_filesystem.h"
 
+namespace {
+/**
+ * This function replaces some HTML entities in strings, e.g. &nbsp;.
+ * It is used by the renderer after the tags have been parsed.
+ */
+void replace_entities(std::string* text) {
+	boost::replace_all(*text, "&gt;", ">");
+	boost::replace_all(*text, "&lt;", "<");
+	boost::replace_all(*text, "&nbsp;", " ");
+	boost::replace_all(*text, "&amp;", "&");  // Must be performed last
+}
+} // namespace
+
 namespace RT {
 
 static const uint16_t INFINITE_WIDTH = 65535;  // 2^16-1
@@ -93,6 +105,7 @@
 	uint8_t spacing;
 	UI::Align halign;
 	UI::Align valign;
+	const bool is_rtl;
 	std::string reference;
 };
 
@@ -975,7 +988,7 @@
 	   : RenderNode(ns),
 	     image_(image),
 	     filename_(""),
-	     scale_(1.0f),
+	     scale_(1.0),
 	     color_(RGBColor(0, 0, 0)),
 	     use_playercolor_(false) {
 		check_size();
@@ -1234,7 +1247,7 @@
 				nodestyle_.halign = UI::Align::kLeft;
 			}
 		}
-		nodestyle_.halign = mirror_alignment(nodestyle_.halign);
+		nodestyle_.halign = mirror_alignment(nodestyle_.halign, nodestyle_.is_rtl);
 		if (a.has("valign")) {
 			const std::string align = a["valign"].get_string();
 			if (align == "bottom") {
@@ -1715,7 +1728,7 @@
 }
 
 std::shared_ptr<RenderNode>
-Renderer::layout(const std::string& text, uint16_t width, const TagSet& allowed_tags) {
+Renderer::layout(const std::string& text, uint16_t width, bool is_rtl, const TagSet& allowed_tags) {
 	std::unique_ptr<Tag> rt(parser_->parse(text, allowed_tags));
 
 	if (!width) {
@@ -1735,6 +1748,7 @@
 	                           0,
 	                           UI::Align::kLeft,
 	                           UI::Align::kTop,
+							   is_rtl,
 	                           ""};
 
 	RTTagHandler rtrn(
@@ -1749,8 +1763,8 @@
 }
 
 std::shared_ptr<const UI::RenderedText>
-Renderer::render(const std::string& text, uint16_t width, const TagSet& allowed_tags) {
-	std::shared_ptr<RenderNode> node(layout(text, width, allowed_tags));
+Renderer::render(const std::string& text, uint16_t width, bool is_rtl, const TagSet& allowed_tags) {
+	std::shared_ptr<RenderNode> node(layout(text, width, is_rtl, allowed_tags));
 	return std::shared_ptr<const UI::RenderedText>(node->render(texture_cache_));
 }
 }  // namespace RT
 
=== modified file 'src/graphic/text/rt_render.h'
--- src/graphic/text/rt_render.h	2019-02-23 11:00:49 +0000
+++ src/graphic/text/rt_render.h	2019-05-26 02:00:17 +0000
@@ -70,11 +70,11 @@
 	// Render the given string in the given width. Restricts the allowed tags to
 	// the ones in TagSet.
 	std::shared_ptr<const UI::RenderedText>
-	render(const std::string&, uint16_t width, const TagSet& tagset = TagSet());
+	render(const std::string&, uint16_t width, bool is_rtl, const TagSet& tagset = TagSet());
 
 private:
 	std::shared_ptr<RenderNode>
-	layout(const std::string& text, uint16_t width, const TagSet& allowed_tags);
+	layout(const std::string& text, uint16_t width, bool is_rtl, const TagSet& allowed_tags);
 
 	std::unique_ptr<FontCache> font_cache_;
 	std::unique_ptr<Parser> parser_;
 
=== removed file 'src/graphic/text_constants.cc'
--- src/graphic/text_constants.cc	2017-03-04 12:37:17 +0000
+++ src/graphic/text_constants.cc	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-// Dummy to make CMake happy
 
=== removed file 'src/graphic/text_constants.h'
--- src/graphic/text_constants.h	2019-02-23 11:00:49 +0000
+++ src/graphic/text_constants.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2006-2019 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef WL_GRAPHIC_TEXT_CONSTANTS_H
-#define WL_GRAPHIC_TEXT_CONSTANTS_H
-
-// Basic constants for often used text attributes.
-
-/// Font Sizes
-#define UI_FONT_SIZE_BIG 22
-#define UI_FONT_SIZE_SMALL 14
-#define UI_FONT_SIZE_MESSAGE 12
-#define UI_FONT_SIZE_ULTRASMALL 10
-constexpr int kMinimumFontSize = 6;
-constexpr int kLineMargin = 1;
-
-/// Font colors
-
-/// Global UI font color
-#define UI_FONT_CLR_FG RGBColor(255, 255, 0)
-#define UI_FONT_CLR_DISABLED RGBColor(127, 127, 127)
-#define UI_FONT_CLR_WARNING RGBColor(255, 22, 22)
-
-/// Tooltip font color
-#define UI_FONT_TOOLTIP_CLR RGBColor(255, 255, 0)
-
-/// Colors for good/ok/bad
-#define UI_FONT_CLR_BRIGHT RGBColor(255, 250, 170)
-#define UI_FONT_CLR_DARK RGBColor(163, 144, 19)
-#define UI_FONT_CLR_BAD RGBColor(187, 0, 0)
-#define UI_FONT_CLR_OK RGBColor(255, 225, 30)
-#define UI_FONT_CLR_GOOD RGBColor(0, 187, 0)
-
-#endif  // end of include guard: WL_GRAPHIC_TEXT_CONSTANTS_H
 
=== modified file 'src/graphic/text_layout.cc'
--- src/graphic/text_layout.cc	2019-04-18 16:50:35 +0000
+++ src/graphic/text_layout.cc	2019-05-26 02:00:17 +0000
@@ -19,18 +19,14 @@
 
 #include "graphic/text_layout.h"
 
-#include <map>
-
-#include <SDL_ttf.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 
 #include "graphic/font_handler.h"
 #include "graphic/graphic.h"
 #include "graphic/image.h"
-#include "graphic/text/bidi.h"
+#include "graphic/style_manager.h"
 #include "graphic/text/font_set.h"
-#include "graphic/text_constants.h"
 
 namespace {
 bool is_paragraph(const std::string& text) {
@@ -40,70 +36,8 @@
 bool is_div(const std::string& text) {
 	return boost::starts_with(text, "<div");
 }
-}  // namespace
-
-void replace_entities(std::string* text) {
-	boost::replace_all(*text, "&gt;", ">");
-	boost::replace_all(*text, "&lt;", "<");
-	boost::replace_all(*text, "&nbsp;", " ");
-	boost::replace_all(*text, "&amp;", "&");  // Must be performed last
-}
-
-int text_width(const std::string& text, int ptsize) {
-	return UI::g_fh
-	   ->render(as_editorfont(
-	      text.substr(0, g_gr->max_texture_size_for_font_rendering() / text_height() - 1),
-	      ptsize - UI::g_fh->fontset()->size_offset()))
-	   ->width();
-}
-
-int text_height(int ptsize, UI::FontSet::Face face) {
-	return UI::g_fh
-	   ->render(as_aligned(UI::g_fh->fontset()->representative_character(), UI::Align::kLeft,
-	                       ptsize - UI::g_fh->fontset()->size_offset(), RGBColor(0, 0, 0), face))
-	   ->height();
-}
-
-std::string richtext_escape(const std::string& given_text) {
-	std::string text = given_text;
-	boost::replace_all(text, "&", "&amp;");  // Must be performed first
-	boost::replace_all(text, ">", "&gt;");
-	boost::replace_all(text, "<", "&lt;");
-	return text;
-}
-
-std::string as_game_tip(const std::string& txt) {
-	static boost::format f(
-	   "<rt><p align=center><font color=21211b face=serif size=16>%s</font></p></rt>");
-	f % txt;
-	return f.str();
-}
-
-std::string
-as_uifont(const std::string& txt, int size, const RGBColor& clr, UI::FontSet::Face face) {
-	return as_aligned(txt, UI::Align::kLeft, size, clr, face);
-}
-
-std::string
-as_condensed(const std::string& text, UI::Align align, int ptsize, const RGBColor& clr) {
-	return as_aligned(text, align, ptsize, clr, UI::FontSet::Face::kCondensed);
-}
-
-std::string as_editorfont(const std::string& text, int ptsize, const RGBColor& clr) {
-	// UI Text is always bold due to historic reasons
-	static boost::format f(
-	   "<rt keep_spaces=1><p><font face=sans size=%i bold=1 shadow=1 color=%s>%s</font></p></rt>");
-	f % ptsize;
-	f % clr.hex_value();
-	f % richtext_escape(text);
-	return f.str();
-}
-
-std::string as_aligned(const std::string& txt,
-                       UI::Align align,
-                       int ptsize,
-                       const RGBColor& clr,
-                       UI::FontSet::Face face) {
+
+std::string as_richtext_paragraph(const std::string& text, UI::Align align) {
 	std::string alignment = "left";
 	switch (align) {
 	case UI::Align::kCenter:
@@ -117,38 +51,48 @@
 		break;
 	}
 
-	std::string font_face = "sans";
-
-	switch (face) {
-	case UI::FontSet::Face::kCondensed:
-		font_face = "condensed";
-		break;
-	case UI::FontSet::Face::kSerif:
-		font_face = "serif";
-		break;
-	case UI::FontSet::Face::kSans:
-		font_face = "sans";
-		break;
-	}
-
-	// UI Text is always bold due to historic reasons
-	static boost::format f(
-	   "<rt><p align=%s><font face=%s size=%i bold=1 shadow=1 color=%s>%s</font></p></rt>");
+	static boost::format f("<rt><p align=%s>%s</p></rt>");
 	f % alignment;
-	f % font_face;
-	f % ptsize;
-	f % clr.hex_value();
-	f % txt;
+	f % text;
 	return f.str();
 }
+}  // namespace
+
+int text_width(const std::string& text, const UI::FontStyleInfo& style, float scale) {
+	UI::FontStyleInfo info(style);
+	info.set_size(info.size() * scale - UI::g_fh->fontset()->size_offset());
+	return UI::g_fh
+	   ->render(as_editor_richtext_paragraph(text, info))->width();
+}
+
+int text_height(const UI::FontStyleInfo& style, float scale) {
+	UI::FontStyleInfo info(style);
+	info.set_size(info.size() * scale - UI::g_fh->fontset()->size_offset());
+	return UI::g_fh
+	   ->render(as_richtext_paragraph(UI::g_fh->fontset()->representative_character(), info))
+	   ->height();
+}
+
+int text_height(UI::FontStyle style, float scale) {
+	return text_height(g_gr->styles().font_style(style), scale);
+}
+
+std::string richtext_escape(const std::string& given_text) {
+	std::string text = given_text;
+	boost::replace_all(text, "&", "&amp;");  // Must be performed first
+	boost::replace_all(text, ">", "&gt;");
+	boost::replace_all(text, "<", "&lt;");
+	return text;
+}
 
 /// Bullet list item
-std::string as_listitem(const std::string& txt, int ptsize, const RGBColor& clr) {
+std::string as_listitem(const std::string& txt, UI::FontStyle style) {
 	static boost::format f("<div width=100%%><div><p><font size=%d "
 	                       "color=%s>•</font></p></div><div><p><space gap=6></p></div><div "
 	                       "width=*><p><font size=%d color=%s>%s<vspace "
 	                       "gap=6></font></p></div></div>");
-	f % ptsize % clr.hex_value() % ptsize % clr.hex_value() % txt;
+	const UI::FontStyleInfo& font_style = g_gr->styles().font_style(style);
+	f % font_style.size() % font_style.color().hex_value() % font_style.size() % font_style.color().hex_value() % txt;
 	return f.str();
 }
 
@@ -158,33 +102,83 @@
 	return f.str();
 }
 
-std::string as_tooltip(const std::string& txt) {
-	static boost::format f("<rt><p><font face=sans size=%i bold=1 color=%s>%s</font></p></rt>");
-
-	f % UI_FONT_SIZE_SMALL;
-	f % UI_FONT_TOOLTIP_CLR.hex_value();
-	f % txt;
-	return f.str();
-}
-
-std::string as_waresinfo(const std::string& txt) {
-	static boost::format f("<rt><p><font face=condensed size=10 bold=0 color=%s>%s</font></p></rt>");
-	f % UI_FONT_TOOLTIP_CLR.hex_value();
-	f % txt;
-	return f.str();
+std::string as_richtext_paragraph(const std::string& text, UI::FontStyle style, UI::Align align) {
+	return as_richtext_paragraph(text, g_gr->styles().font_style(style), align);
+}
+
+std::string as_richtext_paragraph(const std::string& text, const UI::FontStyleInfo& style, UI::Align align) {
+	return as_richtext_paragraph(style.as_font_tag(text), align);
+}
+
+std::string as_editor_richtext_paragraph(const std::string& text, const UI::FontStyleInfo& style) {
+	static boost::format f("<rt keep_spaces=1><p>%s</p></rt>");
+	f % style.as_font_tag(text);
+	return f.str();
+}
+
+std::string as_game_tip(const std::string& txt) {
+	static boost::format f("<rt><p align=center>%s</p></rt>");
+	f % g_gr->styles().font_style(UI::FontStyle::kFsMenuGameTip).as_font_tag(txt);
+	return f.str();
+}
+
+std::string as_mapobject_message(const std::string& image, int width, const std::string& txt, const RGBColor* player_color) {
+	assert(!image.empty());
+	assert(!txt.empty());
+	const std::string image_type = g_gr->images().has(image) ? "src" : "object";
+	static boost::format f_color("<div padding_r=10><p><img width=%d %s=%s color=%s></p></div>"
+						   "<div width=*><p>%s</p></div>");
+	static boost::format f_nocolor("<div padding_r=10><p><img width=%d %s=%s></p></div>"
+						   "<div width=*><p>%s</p></div>");
+	if (player_color != nullptr) {
+		f_color % width;
+		f_color % image_type;
+		f_color % image;
+		f_color % player_color->hex_value();
+		f_color % g_gr->styles().font_style(UI::FontStyle::kWuiMessageParagraph).as_font_tag(txt);
+		return f_color.str();
+	} else {
+		f_nocolor % width;
+		f_nocolor % image_type;
+		f_nocolor % image;
+		f_nocolor % g_gr->styles().font_style(UI::FontStyle::kWuiMessageParagraph).as_font_tag(txt);
+		return f_nocolor.str();
+	}
 }
 
 std::string as_message(const std::string& heading, const std::string& body) {
 	return (
 	   (boost::format(
-	       "<rt><p><font size=18 bold=1 color=D1D1D1>%s<br></font></p><vspace gap=6>%s</rt>") %
-	    heading %
+	       "<rt><p>%s<br></p><vspace gap=6>%s</rt>") %
+	    g_gr->styles().font_style(UI::FontStyle::kWuiMessageHeading).as_font_tag(heading) %
 	    (is_paragraph(body) || is_div(body) ?
 	        body :
-	        (boost::format("<p><font size=%d>%s</font></p>") % UI_FONT_SIZE_MESSAGE % body).str()))
+	        (boost::format("<p>%s</p>") %
+	         g_gr->styles().font_style(UI::FontStyle::kWuiMessageParagraph).as_font_tag(body))
+	           .str()))
 	      .str());
 }
 
+std::shared_ptr<const UI::RenderedText> autofit_text(const std::string& text,
+																	  const UI::FontStyleInfo& font_info,
+																	  int width) {
+	std::shared_ptr<const UI::RenderedText> rendered_text =
+	   UI::g_fh->render(as_richtext_paragraph(text, font_info));
+
+	// Autoshrink if it doesn't fit
+	if (width > 0 && rendered_text->width() > width) {
+		const int minimum_size = g_gr->styles().minimum_font_size();
+		// We take a copy, because we are changing values during the autofit.
+		UI::FontStyleInfo temp_font_info(font_info);
+		temp_font_info.make_condensed();
+		while (rendered_text->width() > width && temp_font_info.size() >= minimum_size) {
+			rendered_text = UI::g_fh->render(as_richtext_paragraph(text, temp_font_info));
+			temp_font_info.set_size(temp_font_info.size() - 1);
+		}
+	}
+	return rendered_text;
+}
+
 std::string as_heading_with_content(const std::string& header,
                                     const std::string& content,
                                     UI::PanelStyle style,
@@ -192,18 +186,16 @@
                                     bool noescape) {
 	switch (style) {
 	case UI::PanelStyle::kFsMenu:
-		return (boost::format(
-		           "<p><font size=%i bold=1 shadow=1>%s%s <font color=D1D1D1>%s</font></font></p>") %
-		        UI_FONT_SIZE_SMALL % (is_first ? "" : "<vspace gap=9>") %
-		        (noescape ? header : richtext_escape(header)) %
-		        (noescape ? content : richtext_escape(content)))
+		return (boost::format("<p>%s%s %s</p>") %
+		         (is_first ? "" : "<vspace gap=9>") %
+		        g_gr->styles().font_style(UI::FontStyle::kFsMenuInfoPanelHeading).as_font_tag(noescape ? header : richtext_escape(header)) %
+		        g_gr->styles().font_style(UI::FontStyle::kFsMenuInfoPanelParagraph).as_font_tag(noescape ? content : richtext_escape(content)))
 		   .str();
 	case UI::PanelStyle::kWui:
-		return (boost::format(
-		           "<p><font size=%i>%s<font bold=1 color=D1D1D1>%s</font> %s</font></p>") %
-		        UI_FONT_SIZE_SMALL % (is_first ? "" : "<vspace gap=6>") %
-		        (noescape ? header : richtext_escape(header)) %
-		        (noescape ? content : richtext_escape(content)))
+		return (boost::format("<p>%s%s %s</p>") %
+		        (is_first ? "" : "<vspace gap=6>") %
+		        g_gr->styles().font_style(UI::FontStyle::kWuiInfoPanelHeading).as_font_tag(noescape ? header : richtext_escape(header)) %
+		        g_gr->styles().font_style(UI::FontStyle::kWuiInfoPanelParagraph).as_font_tag(noescape ? content : richtext_escape(content)))
 		   .str();
 	}
 	NEVER_HERE();
@@ -212,12 +204,16 @@
 std::string as_heading(const std::string& txt, UI::PanelStyle style, bool is_first) {
 	switch (style) {
 	case UI::PanelStyle::kFsMenu:
-		return (boost::format("<p><font size=%i bold=1 shadow=1>%s%s</font></p>") %
-		        UI_FONT_SIZE_SMALL % (is_first ? "" : "<vspace gap=9>") % richtext_escape(txt))
+		return (boost::format("<p>%s%s</p>") % (is_first ? "" : "<vspace gap=9>") %
+		        g_gr->styles()
+		           .font_style(UI::FontStyle::kFsMenuInfoPanelHeading)
+		           .as_font_tag(richtext_escape(txt)))
 		   .str();
 	case UI::PanelStyle::kWui:
-		return (boost::format("<p><font size=%i bold=1 color=D1D1D1>%s%s</font></p>") %
-		        UI_FONT_SIZE_SMALL % (is_first ? "" : "<vspace gap=6>") % richtext_escape(txt))
+		return (boost::format("<p>%s%s</p>") % (is_first ? "" : "<vspace gap=6>") %
+		        g_gr->styles()
+		           .font_style(UI::FontStyle::kWuiInfoPanelHeading)
+		           .as_font_tag(richtext_escape(txt)))
 		   .str();
 	}
 	NEVER_HERE();
@@ -226,78 +222,17 @@
 std::string as_content(const std::string& txt, UI::PanelStyle style) {
 	switch (style) {
 	case UI::PanelStyle::kFsMenu:
-		return (boost::format("<p><font size=%i color=D1D1D1 shadow=1><vspace gap=2>%s</font></p>") %
-		        UI_FONT_SIZE_SMALL % richtext_escape(txt))
+		return (boost::format("<p><vspace gap=2>%s</p>") %
+		        g_gr->styles()
+		           .font_style(UI::FontStyle::kFsMenuInfoPanelParagraph)
+		           .as_font_tag(richtext_escape(txt)))
 		   .str();
 	case UI::PanelStyle::kWui:
-		return (boost::format("<p><font size=%i><vspace gap=2>%s</font></p>") %
-		        (UI_FONT_SIZE_SMALL - 2) % richtext_escape(txt))
+		return (boost::format("<p><vspace gap=2>%s</p>") %
+		        g_gr->styles()
+		           .font_style(UI::FontStyle::kWuiInfoPanelParagraph)
+		           .as_font_tag(richtext_escape(txt)))
 		   .str();
 	}
 	NEVER_HERE();
 }
-
-std::shared_ptr<const UI::RenderedText>
-autofit_ui_text(const std::string& text, int width, RGBColor color, int fontsize) {
-	std::shared_ptr<const UI::RenderedText> result =
-	   UI::g_fh->render(as_uifont(richtext_escape(text), fontsize, color));
-	if (width > 0) {  // Autofit
-		for (; result->width() > width && fontsize >= kMinimumFontSize; --fontsize) {
-			result = UI::g_fh->render(
-			   as_condensed(richtext_escape(text), UI::Align::kLeft, fontsize, color));
-		}
-	}
-	return result;
-}
-
-namespace UI {
-
-/**
- * This mirrors the horizontal alignment for RTL languages.
- *
- * Do not store this value as it is based on the global font setting.
- *
- * If 'checkme' is not empty, mirror the alignment if the first 20 characters contain an RTL
- * character. Otherwise, mirror if the current fontset is RTL.
- */
-Align mirror_alignment(Align alignment, const std::string& checkme) {
-	bool do_swap_alignment = checkme.empty() ? UI::g_fh->fontset()->is_rtl() :
-	                                           i18n::has_rtl_character(checkme.c_str(), 20);
-	if (do_swap_alignment) {
-		switch (alignment) {
-		case Align::kLeft:
-			alignment = Align::kRight;
-			break;
-		case Align::kRight:
-			alignment = Align::kLeft;
-			break;
-		case Align::kCenter:
-			break;
-		}
-	}
-	return alignment;
-}
-
-/**
- * Align pt horizontally to match align based on width w.
- *
- * When correcting for align, we never move from pixel boundaries to
- * sub-pixels, because this might lead from pixel-perfect rendering to
- * subsampled rendering - this can lead to blurry texts. That is why we
- * never do float divisions in this function.
- */
-void correct_for_align(Align align, uint32_t w, Vector2i* pt) {
-
-	if (align == Align::kCenter)
-		pt->x -= w / 2;
-	else if (align == Align::kRight)
-		pt->x -= w;
-}
-
-/**
- * Adjust the y coordinate in 'point 'pt' to vertically center an element with height 'h'.
- */
-void center_vertically(uint32_t h, Vector2i* pt) {
-	pt->y -= h / 2;
-}
-}  // namespace UI
 
=== modified file 'src/graphic/text_layout.h'
--- src/graphic/text_layout.h	2019-04-18 16:50:35 +0000
+++ src/graphic/text_layout.h	2019-05-26 02:00:17 +0000
@@ -23,30 +23,26 @@
 #include <string>
 
 #include "graphic/align.h"
+#include "graphic/styles/font_style.h"
+#include "graphic/styles/panel_styles.h"
+#include "graphic/text/rendered_text.h"
 #include "graphic/color.h"
 #include "graphic/font_handler.h"
 #include "graphic/image.h"
-#include "graphic/panel_styles.h"
 #include "graphic/text/font_set.h"
-#include "graphic/text_constants.h"
-
-/**
- * This function replaces some HTML entities in strings, e.g. %nbsp;.
- * It is used by the renderers after the tags have been parsed.
- */
-void replace_entities(std::string* text);
-
-/**
- * Returns the exact width of the text rendered as editorfont for the given font size.
- * This function is inefficient; only call when we need the exact width.
- */
-int text_width(const std::string& text, int ptsize = UI_FONT_SIZE_SMALL);
-
-/**
- * Returns the exact height of the text rendered for the given font size and face.
- * This function is inefficient; only call when we need the exact height.
- */
-int text_height(int ptsize = UI_FONT_SIZE_SMALL, UI::FontSet::Face face = UI::FontSet::Face::kSans);
+
+/**
+  * Returns the exact width of the text rendered as editorfont for the given font size.
+  * This function is inefficient; only call when we need the exact width.
+  */
+int text_width(const std::string& text, const UI::FontStyleInfo& style, float scale = 1.0f);
+
+/**
+  * Returns the exact height of the text rendered for the given font size and face.
+  * This function is inefficient; only call when we need the exact height.
+  */
+int text_height(const UI::FontStyleInfo& style, float scale = 1.0f);
+int text_height(UI::FontStyle style, float scale = 1.0f);
 
 /**
  * Checks it the given string is RichText or not. Does not do validity checking.
@@ -60,42 +56,35 @@
  */
 std::string richtext_escape(const std::string& given_text);
 
+std::string as_richtext(const std::string&);
+
 /**
  * Convenience functions to convert simple text into a valid block
  * of rich text which can be rendered.
  */
-std::string as_uifont(const std::string&,
-                      int ptsize = UI_FONT_SIZE_SMALL,
-                      const RGBColor& clr = UI_FONT_CLR_FG,
-                      UI::FontSet::Face face = UI::FontSet::Face::kSans);
-
-// Same as as_aligned, but with the condensed font preselected.
-std::string as_condensed(const std::string& text,
-                         UI::Align align = UI::Align::kLeft,
-                         int ptsize = UI_FONT_SIZE_SMALL,
-                         const RGBColor& clr = UI_FONT_CLR_FG);
-
-std::string as_editorfont(const std::string& text,
-                          int ptsize = UI_FONT_SIZE_SMALL,
-                          const RGBColor& clr = UI_FONT_CLR_FG);
-
-std::string as_aligned(const std::string& txt,
-                       UI::Align align,
-                       int ptsize = UI_FONT_SIZE_SMALL,
-                       const RGBColor& clr = UI_FONT_CLR_FG,
-                       UI::FontSet::Face face = UI::FontSet::Face::kSans);
-
-std::string as_listitem(const std::string&,
-                        int ptsize = UI_FONT_SIZE_SMALL,
-                        const RGBColor& clr = UI_FONT_CLR_FG);
-
-std::string as_richtext(const std::string&);
-std::string as_tooltip(const std::string&);
-std::string as_waresinfo(const std::string&);
+std::string as_richtext_paragraph(const std::string& text, UI::FontStyle style, UI::Align align = UI::Align::kLeft);
+std::string as_richtext_paragraph(const std::string& text, const UI::FontStyleInfo& style, UI::Align align = UI::Align::kLeft);
+std::string as_editor_richtext_paragraph(const std::string& text, const UI::FontStyleInfo& style);
+
+std::string as_listitem(const std::string&, UI::FontStyle style);
+
 std::string as_game_tip(const std::string&);
+/// Format message to player. 'image' is either an image filename or a map object name.
+std::string as_mapobject_message(const std::string& image, int width, const std::string& txt, const RGBColor* player_color = nullptr);
 std::string as_message(const std::string& heading, const std::string& body);
 
 /**
+
+  * Render 'text' with the given font style. If 'width' > 0 and the rendered image is too
+  * wide, it will first use the condensed font face and then make the text
+  * smaller until it fits 'width'. The resulting font size will not go below
+  * 'StyleManager::minimum_font_size()'.
+  */
+std::shared_ptr<const UI::RenderedText> autofit_text(const std::string& text,
+																	  const UI::FontStyleInfo& font_info,
+																	  int width);
+
+/**
  * 'is_first' omits the vertical gap before the line.
  * 'noescape' is needed for error message formatting and does not call richtext_escape. */
 std::string as_heading_with_content(const std::string& header,
@@ -112,24 +101,4 @@
 /// Paragraph in menu info texts
 std::string as_content(const std::string& txt, UI::PanelStyle style);
 
-/**
- * Render 'text' as ui_font. If 'width' > 0 and the rendered image is too
- * wide, it will first use the condensed font face and then make the text
- * smaller until it fits 'width'. The resulting font size will not go below
- * 'kMinimumFontSize'.
- */
-std::shared_ptr<const UI::RenderedText> autofit_ui_text(const std::string& text,
-                                                        int width = 0,
-                                                        RGBColor color = UI_FONT_CLR_FG,
-                                                        int fontsize = UI_FONT_SIZE_SMALL);
-
-namespace UI {
-
-Align mirror_alignment(Align alignment, const std::string& checkme = "");
-
-void center_vertically(uint32_t h, Vector2i* pt);
-void correct_for_align(Align, uint32_t w, Vector2i* pt);
-
-}  // namespace UI
-
 #endif  // end of include guard: WL_GRAPHIC_TEXT_LAYOUT_H
 
=== modified file 'src/graphic/wordwrap.cc'
--- src/graphic/wordwrap.cc	2019-02-23 11:00:49 +0000
+++ src/graphic/wordwrap.cc	2019-05-26 02:00:17 +0000
@@ -36,6 +36,30 @@
 #include "graphic/text/font_io.h"
 #include "graphic/text_layout.h"
 
+namespace {
+std::string as_editorfont(const std::string& text, int ptsize, const RGBColor& clr) {
+	// UI Text is always bold due to historic reasons
+	static boost::format f(
+	   "<rt keep_spaces=1><p><font face=sans size=%i bold=1 shadow=1 color=%s>%s</font></p></rt>");
+	f % ptsize;
+	f % clr.hex_value();
+	f % richtext_escape(text);
+	return f.str();
+}
+
+int text_width(const std::string& text, int ptsize) {
+	RGBColor color(0, 0, 0);
+	return UI::g_fh->render(as_editorfont(text, ptsize - UI::g_fh->fontset()->size_offset(), color))
+	   ->width();
+}
+
+int text_height(int ptsize) {
+	RGBColor font_color(0, 0, 0);
+	const UI::FontStyleInfo font_info("sans", font_color, ptsize, false, false, false, false);
+	return UI::g_fh->render(as_richtext_paragraph(UI::g_fh->fontset()->representative_character(), font_info))->height();
+}
+} // namespace
+
 namespace UI {
 
 WordWrap::WordWrap(int fontsize, const RGBColor& color, uint32_t gwrapwidth)
@@ -299,7 +323,7 @@
 
 	++where.y;
 
-	Align alignment = mirror_alignment(align);
+	Align alignment = mirror_alignment(align, g_fh->fontset()->is_rtl());
 
 	const int fontheight = text_height(fontsize_);
 	for (uint32_t line = 0; line < lines_.size(); ++line, where.y += fontheight) {
 
=== modified file 'src/graphic/wordwrap.h'
--- src/graphic/wordwrap.h	2019-02-23 11:00:49 +0000
+++ src/graphic/wordwrap.h	2019-05-26 02:00:17 +0000
@@ -27,8 +27,8 @@
 #include "base/vector.h"
 #include "graphic/align.h"
 #include "graphic/color.h"
+#include "graphic/graphic.h"
 #include "graphic/text/sdl_ttf_font.h"
-#include "graphic/text_constants.h"
 
 class RenderTarget;
 
@@ -38,9 +38,9 @@
  * Helper struct that provides word wrapping and related functionality.
  */
 struct WordWrap {
-	WordWrap(int fontsize = UI_FONT_SIZE_SMALL,
-	         const RGBColor& color = UI_FONT_CLR_FG,
-	         uint32_t wrapwidth = std::numeric_limits<uint32_t>::max());
+	static constexpr int kLineMargin = 1;
+
+	explicit WordWrap(int fontsize, const RGBColor& color, uint32_t wrapwidth);
 
 	void set_wrapwidth(uint32_t wrapwidth);
 
 
=== modified file 'src/io/filesystem/filesystem.cc'
--- src/io/filesystem/filesystem.cc	2019-02-23 11:00:49 +0000
+++ src/io/filesystem/filesystem.cc	2019-05-26 02:00:17 +0000
@@ -205,7 +205,7 @@
 	   (boost::format(pgettext("illegal_filename_characters", "%s at the start of the filename")) %
 	    richtext_escape(i18n::localize_list(starting_characters, i18n::ConcatenateWith::OR)))
 	      .str(),
-	   UI_FONT_SIZE_MESSAGE));
+	   UI::FontStyle::kWuiMessageParagraph));
 
 	const std::string illegal(as_listitem(
 	   /** TRANSLATORS: Tooltip entry for characters in illegal filenames.
@@ -213,7 +213,7 @@
 	   (boost::format(pgettext("illegal_filename_characters", "%s anywhere in the filename")) %
 	    richtext_escape(i18n::localize_list(illegal_filename_characters, i18n::ConcatenateWith::OR)))
 	      .str(),
-	   UI_FONT_SIZE_MESSAGE));
+	   UI::FontStyle::kWuiMessageParagraph));
 
 	return (boost::format("%s%s%s") %
 	        /** TRANSLATORS: Tooltip header for characters in illegal filenames.
 
=== modified file 'src/logic/map_objects/CMakeLists.txt'
--- src/logic/map_objects/CMakeLists.txt	2019-05-05 18:53:14 +0000
+++ src/logic/map_objects/CMakeLists.txt	2019-05-26 02:00:17 +0000
@@ -125,7 +125,6 @@
     graphic_fonthandler
     graphic_image_io
     graphic_surface
-    graphic_text_constants
     graphic_text_layout
     helper
     io_fileread
 
=== modified file 'src/logic/map_objects/immovable.cc'
--- src/logic/map_objects/immovable.cc	2019-05-19 12:25:24 +0000
+++ src/logic/map_objects/immovable.cc	2019-05-26 02:00:17 +0000
@@ -32,7 +32,6 @@
 #include "config.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
-#include "graphic/text_constants.h"
 #include "helper.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
@@ -526,9 +525,7 @@
 
 	// Additionally, if statistics are enabled, draw a progression string
 	do_draw_info(draw_text, descr().descname(),
-	             (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_DARK.hex_value() %
-	              (boost::format(_("%i%% built")) % (100 * done / total)).str())
-	                .str(),
+	             g_gr->styles().color_tag((boost::format(_("%i%% built")) % (100 * done / total)).str(), g_gr->styles().building_statistics_style().construction_color()),
 	             point_on_dst, scale, dst);
 }
 
 
=== modified file 'src/logic/map_objects/map_object.cc'
--- src/logic/map_objects/map_object.cc	2019-05-18 20:43:25 +0000
+++ src/logic/map_objects/map_object.cc	2019-05-26 02:00:17 +0000
@@ -32,6 +32,7 @@
 #include "graphic/font_handler.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/style_manager.h"
 #include "graphic/text_layout.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
@@ -485,20 +486,25 @@
 	if (scale < 1.f) {
 		return;
 	}
-	const int font_size = scale * UI_FONT_SIZE_SMALL;
+
+	UI::FontStyleInfo census_font(g_gr->styles().building_statistics_style().census_font());
+	census_font.set_size(scale * census_font.size());
 
 	// We always render this so we can have a stable position for the statistics string.
 	std::shared_ptr<const UI::RenderedText> rendered_census =
-	   UI::g_fh->render(as_condensed(census, UI::Align::kCenter, font_size), 120 * scale);
+			UI::g_fh->render(as_richtext_paragraph(census, census_font, UI::Align::kCenter), 120 * scale);
 	Vector2i position = field_on_dst.cast<int>() - Vector2i(0, 48) * scale;
 	if ((draw_text & TextToDraw::kCensus) != TextToDraw::kNone) {
 		rendered_census->draw(*dst, position, UI::Align::kCenter);
 	}
 
 	if ((draw_text & TextToDraw::kStatistics) != TextToDraw::kNone && !statictics.empty()) {
+		UI::FontStyleInfo statistics_font(g_gr->styles().building_statistics_style().statistics_font());
+		statistics_font.set_size(scale * statistics_font.size());
+
 		std::shared_ptr<const UI::RenderedText> rendered_statistics =
-		   UI::g_fh->render(as_condensed(statictics, UI::Align::kCenter, font_size));
-		position.y += rendered_census->height() + text_height(font_size) / 4;
+		   UI::g_fh->render(as_richtext_paragraph(statictics, statistics_font, UI::Align::kCenter));
+		position.y += rendered_census->height() + text_height(statistics_font) / 4;
 		rendered_statistics->draw(*dst, position, UI::Align::kCenter);
 	}
 }
 
=== modified file 'src/logic/map_objects/tribes/building.cc'
--- src/logic/map_objects/tribes/building.cc	2019-05-11 13:48:12 +0000
+++ src/logic/map_objects/tribes/building.cc	2019-05-26 02:00:17 +0000
@@ -33,7 +33,7 @@
 #include "economy/input_queue.h"
 #include "economy/request.h"
 #include "graphic/rendertarget.h"
-#include "graphic/text_constants.h"
+#include "graphic/text_layout.h"
 #include "io/filesystem/filesystem.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "logic/game.h"
@@ -774,10 +774,10 @@
                             uint32_t throttle_time,
                             uint32_t throttle_radius) {
 	const std::string rt_description =
-	   (boost::format("<div padding_r=10><p><img object=%s color=%s></p></div>"
-	                  "<div width=*><p><font size=%d>%s</font></p></div>") %
-	    descr().name() % owner().get_playercolor().hex_value() % UI_FONT_SIZE_MESSAGE % description)
-	      .str();
+			as_mapobject_message(descr().name(),
+								 descr().representative_image()->width(),
+								 description,
+								 &owner().get_playercolor());
 
 	std::unique_ptr<Message> msg(new Message(msgtype, game.get_gametime(), title, icon_filename,
 	                                         heading, rt_description, get_position(),
 
=== modified file 'src/logic/map_objects/tribes/constructionsite.cc'
--- src/logic/map_objects/tribes/constructionsite.cc	2019-05-18 20:43:25 +0000
+++ src/logic/map_objects/tribes/constructionsite.cc	2019-05-26 02:00:17 +0000
@@ -30,7 +30,6 @@
 #include "graphic/animation.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
-#include "graphic/text_constants.h"
 #include "logic/editor_game_base.h"
 #include "logic/game.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
@@ -110,9 +109,7 @@
 
 void ConstructionSite::update_statistics_string(std::string* s) {
 	unsigned int percent = (get_built_per64k() * 100) >> 16;
-	*s = (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_DARK.hex_value() %
-	      (boost::format(_("%i%% built")) % percent))
-	        .str();
+	*s = g_gr->styles().color_tag((boost::format(_("%i%% built")) % percent).str(), g_gr->styles().building_statistics_style().construction_color());
 }
 
 /*
 
=== modified file 'src/logic/map_objects/tribes/dismantlesite.cc'
--- src/logic/map_objects/tribes/dismantlesite.cc	2019-05-18 20:43:25 +0000
+++ src/logic/map_objects/tribes/dismantlesite.cc	2019-05-26 02:00:17 +0000
@@ -29,7 +29,6 @@
 #include "economy/wares_queue.h"
 #include "graphic/animation.h"
 #include "graphic/rendertarget.h"
-#include "graphic/text_constants.h"
 #include "logic/editor_game_base.h"
 #include "logic/game.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
@@ -103,9 +102,7 @@
 */
 void DismantleSite::update_statistics_string(std::string* s) {
 	unsigned int percent = (get_built_per64k() * 100) >> 16;
-	*s = (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_DARK.hex_value() %
-	      (boost::format(_("%u%% dismantled")) % percent))
-	        .str();
+	*s = g_gr->styles().color_tag((boost::format(_("%u%% dismantled")) % percent).str(), g_gr->styles().building_statistics_style().construction_color());
 }
 
 /*
 
=== modified file 'src/logic/map_objects/tribes/militarysite.cc'
--- src/logic/map_objects/tribes/militarysite.cc	2019-05-18 20:43:25 +0000
+++ src/logic/map_objects/tribes/militarysite.cc	2019-05-26 02:00:17 +0000
@@ -30,7 +30,6 @@
 #include "base/macros.h"
 #include "economy/flag.h"
 #include "economy/request.h"
-#include "graphic/text_constants.h"
 #include "logic/editor_game_base.h"
 #include "logic/game.h"
 #include "logic/map_objects/findbob.h"
@@ -396,10 +395,9 @@
 			        .str();
 		}
 	}
-	*s = (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_OK.hex_value() %
-	      // Line break to make Codecheck happy.
-	      *s)
-	        .str();
+	*s = g_gr->styles().color_tag(
+				// Line break to make Codecheck happy.
+				*s, g_gr->styles().building_statistics_style().medium_color());
 }
 
 bool MilitarySite::init(EditorGameBase& egbase) {
 
=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc	2019-05-22 15:46:08 +0000
+++ src/logic/map_objects/tribes/productionsite.cc	2019-05-26 02:00:17 +0000
@@ -32,7 +32,6 @@
 #include "economy/ware_instance.h"
 #include "economy/wares_queue.h"
 #include "economy/workers_queue.h"
-#include "graphic/text_constants.h"
 #include "logic/editor_game_base.h"
 #include "logic/game.h"
 #include "logic/game_data_error.h"
@@ -296,28 +295,23 @@
 		nr_workers += working_positions_[--i].worker ? 1 : 0;
 
 	if (nr_workers == 0) {
-		*s = (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_BAD.hex_value() %
-		      _("(not occupied)"))
-		        .str();
+		*s = g_gr->styles().color_tag(_("(not occupied)"), g_gr->styles().building_statistics_style().low_color());
 		return;
 	}
 
 	if (uint32_t const nr_requests = nr_working_positions - nr_workers) {
-		*s = (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_BAD.hex_value() %
+		*s = g_gr->styles().color_tag(
 		      (nr_requests == 1 ?
 		          /** TRANSLATORS: Productivity label on a building if there is 1 worker missing */
 		          _("Worker missing") :
 		          /** TRANSLATORS: Productivity label on a building if there is more than 1 worker
 		             missing. If you need plural forms here, please let us know. */
-		          _("Workers missing")))
-		        .str();
+		          _("Workers missing")), g_gr->styles().building_statistics_style().low_color());
 		return;
 	}
 
 	if (is_stopped_) {
-		*s = (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_BRIGHT.hex_value() %
-		      _("(stopped)"))
-		        .str();
+		*s = g_gr->styles().color_tag(_("(stopped)"), g_gr->styles().building_statistics_style().neutral_color());
 		return;
 	}
 	*s = statistics_string_on_changed_statistics_;
@@ -407,34 +401,32 @@
 
 	const unsigned int lastPercOk = (lastOk * 100) / (STATISTICS_VECTOR_LENGTH / 2);
 
-	std::string color;
-	if (percOk < 33)
-		color = UI_FONT_CLR_BAD.hex_value();
-	else if (percOk < 66)
-		color = UI_FONT_CLR_OK.hex_value();
-	else
-		color = UI_FONT_CLR_GOOD.hex_value();
 	const std::string perc_str =
-	   (boost::format("<font color=%s>%s</font>") % color % (boost::format(_("%i%%")) % percOk))
-	      .str();
-
-	std::string trend;
-	if (lastPercOk > percOk) {
-		trend_ = Trend::kRising;
-		color = UI_FONT_CLR_GOOD.hex_value();
-		trend = "+";
-	} else if (lastPercOk < percOk) {
-		trend_ = Trend::kFalling;
-		color = UI_FONT_CLR_BAD.hex_value();
-		trend = "-";
-	} else {
-		trend_ = Trend::kUnchanged;
-		color = UI_FONT_CLR_BRIGHT.hex_value();
-		trend = "=";
-	}
-	const std::string trend_str = (boost::format("<font color=%s>%s</font>") % color % trend).str();
+			g_gr->styles().color_tag((boost::format(_("%i%%")) % percOk).str(),
+									  (percOk < 33) ? g_gr->styles().building_statistics_style().low_color() :
+															(percOk < 66) ?
+																g_gr->styles().building_statistics_style().medium_color() :
+																g_gr->styles().building_statistics_style().high_color());
 
 	if (0 < percOk && percOk < 100) {
+		RGBColor color = g_gr->styles().building_statistics_style().high_color();
+		std::string trend;
+		if (lastPercOk > percOk) {
+			trend_ = Trend::kRising;
+			color = g_gr->styles().building_statistics_style().high_color();
+			trend = "+";
+		} else if (lastPercOk < percOk) {
+			trend_ = Trend::kFalling;
+			color = g_gr->styles().building_statistics_style().low_color();
+			trend = "-";
+		} else {
+			trend_ = Trend::kUnchanged;
+			color = g_gr->styles().building_statistics_style().neutral_color();
+			trend = "=";
+		}
+
+		const std::string trend_str = g_gr->styles().color_tag((boost::format(_("%i%%")) % trend).str(), color);
+
 		// TODO(GunChleoc): We might need to reverse the order here for RTL languages
 		statistics_string_on_changed_statistics_ =
 		   (boost::format("%s\u2009%s") % perc_str % trend_str).str();
 
=== modified file 'src/logic/map_objects/tribes/ship.cc'
--- src/logic/map_objects/tribes/ship.cc	2019-05-11 13:48:12 +0000
+++ src/logic/map_objects/tribes/ship.cc	2019-05-26 02:00:17 +0000
@@ -31,7 +31,7 @@
 #include "economy/portdock.h"
 #include "economy/wares_queue.h"
 #include "graphic/rendertarget.h"
-#include "graphic/text_constants.h"
+#include "graphic/text_layout.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
 #include "logic/game.h"
@@ -1061,9 +1061,7 @@
 		case (ShipStates::kSinkAnimation):
 			break;
 		}
-		statistics_string = (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_OK.hex_value() %
-		                     statistics_string)
-		                       .str();
+		statistics_string = g_gr->styles().color_tag(statistics_string, g_gr->styles().building_statistics_style().medium_color());
 	}
 
 	do_draw_info(draw_text, shipname_, statistics_string, calc_drawpos(egbase, point_on_dst, scale),
@@ -1128,10 +1126,7 @@
                         const std::string& description,
                         const std::string& picture) {
 	const std::string rt_description =
-	   (boost::format("<div padding_r=10><p><img src=%s></p></div>"
-	                  "<div width=*><p><font size=%d>%s</font></p></div>") %
-	    picture % UI_FONT_SIZE_MESSAGE % description)
-	      .str();
+			as_mapobject_message(picture, g_gr->images().get(picture)->width(), description);
 
 	get_owner()->add_message(game, std::unique_ptr<Message>(new Message(
 	                                  Message::Type::kSeafaring, game.get_gametime(), title, picture,
 
=== modified file 'src/logic/map_objects/tribes/worker.cc'
--- src/logic/map_objects/tribes/worker.cc	2019-05-25 10:47:18 +0000
+++ src/logic/map_objects/tribes/worker.cc	2019-05-26 02:00:17 +0000
@@ -33,8 +33,9 @@
 #include "economy/portdock.h"
 #include "economy/road.h"
 #include "economy/transfer.h"
+#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
-#include "graphic/text_constants.h"
+#include "graphic/text_layout.h"
 #include "helper.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
@@ -972,12 +973,12 @@
 		   MapObjectDescr::OwnerType::kTribe, get_owner());
 
 		// Geologist also sends a message notifying the player
+		// TODO(GunChleoc): We keep formatting this even when timeout has not elapsed
 		if (rdescr && rdescr->detectable() && position.field->get_resources_amount()) {
-			const std::string message =
-			   (boost::format("<div padding_r=10><p><img object=%s></p></div>"
-			                  "<div width=*><p><font size=%d>%s</font></p></div>") %
-			    ri.descr().name() % UI_FONT_SIZE_MESSAGE % _("A geologist found resources."))
-			      .str();
+			const std::string rt_description =
+					as_mapobject_message(ri.descr().name(),
+										 g_gr->images().get(rdescr->representative_image())->width(),
+										 _("A geologist found resources."));
 
 			//  We should add a message to the player's message queue - but only,
 			//  if there is not already a similar one in list.
@@ -985,7 +986,7 @@
 			   game,
 			   std::unique_ptr<Message>(new Message(Message::Type::kGeologists, game.get_gametime(),
 			                                        rdescr->descname(), rdescr->representative_image(),
-			                                        ri.descr().descname(), message, position, serial_,
+			                                        ri.descr().descname(), rt_description, position, serial_,
 			                                        rdescr->name())),
 			   rdescr->timeout_ms(), rdescr->timeout_radius());
 		}
 
=== modified file 'src/ui_basic/CMakeLists.txt'
--- src/ui_basic/CMakeLists.txt	2019-04-09 04:51:44 +0000
+++ src/ui_basic/CMakeLists.txt	2019-05-26 02:00:17 +0000
@@ -67,7 +67,6 @@
     graphic_styles
     graphic_surface
     graphic_text
-    graphic_text_constants
     graphic_text_layout
     graphic_wordwrap
     io_filesystem
 
=== modified file 'src/ui_basic/button.cc'
--- src/ui_basic/button.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/button.cc	2019-05-26 02:00:17 +0000
@@ -24,7 +24,6 @@
 #include "graphic/image.h"
 #include "graphic/rendertarget.h"
 #include "graphic/style_manager.h"
-#include "graphic/text_constants.h"
 #include "graphic/text_layout.h"
 #include "ui_basic/mouse_constants.h"
 
@@ -58,7 +57,7 @@
      time_nextact_(0),
      title_(title_text),
      title_image_(title_image),
-     background_style_(g_gr->styles().button_style(init_style)) {
+     style_(&g_gr->styles().button_style(init_style)) {
 	set_thinks(false);
 	// Don't allow focus
 	assert(!get_can_focus());
@@ -89,7 +88,7 @@
             UI::Button::ImageMode::kShrink) {
 	// Automatically resize for font height and give it a margin.
 	if (h < 1) {
-		int new_height = text_height() + 4;
+		const int new_height = text_height(g_gr->styles().button_style(init_style).enabled().font()) + 4;
 		set_desired_size(w, new_height);
 		set_size(w, new_height);
 	}
@@ -170,8 +169,10 @@
 	const bool is_monochrome =
 	   !enabled_ && static_cast<int>(disable_style_ & ButtonDisableStyle::kMonochrome);
 
+	const UI::TextPanelStyleInfo& style_to_use = is_monochrome ? style_->disabled() : style_->enabled();
+
 	// Draw the background
-	draw_background(dst, *background_style_);
+	draw_background(dst, style_to_use.background());
 
 	if (is_flat && highlighted_)
 		dst.brighten_rect(Recti(0, 0, get_w(), get_h()), MOUSE_OVER_BRIGHT_FACTOR);
@@ -216,8 +217,11 @@
 	} else if (title_.length()) {
 		//  Otherwise draw title string centered
 		std::shared_ptr<const UI::RenderedText> rendered_text =
-		   autofit_ui_text(title_, get_inner_w() - 2 * kButtonImageMargin,
-		                   is_monochrome ? UI_FONT_CLR_DISABLED : UI_FONT_CLR_FG);
+				autofit_text(
+					richtext_escape(title_),
+					style_to_use.font(),
+					get_inner_w() - 2 * kButtonImageMargin);
+
 		// Blit on pixel boundary (not float), so that the text is blitted pixel perfect.
 		rendered_text->draw(dst, Vector2i((get_w() - rendered_text->width()) / 2,
 		                                  (get_h() - rendered_text->height()) / 2));
@@ -363,8 +367,8 @@
 	                           UI::Button::VisualState::kRaised);
 }
 
-void Button::set_background_style(UI::ButtonStyle bstyle) {
-	background_style_ = g_gr->styles().button_style(bstyle);
+void Button::set_style(UI::ButtonStyle bstyle) {
+	style_ = &g_gr->styles().button_style(bstyle);
 }
 
 void Button::toggle() {
 
=== modified file 'src/ui_basic/button.h'
--- src/ui_basic/button.h	2019-02-23 11:00:49 +0000
+++ src/ui_basic/button.h	2019-05-26 02:00:17 +0000
@@ -25,7 +25,7 @@
 #include <boost/signals2.hpp>
 
 #include "graphic/color.h"
-#include "graphic/text_layout.h"
+#include "graphic/styles/button_style.h"
 #include "ui_basic/panel.h"
 
 namespace UI {
@@ -146,7 +146,7 @@
 	void set_perm_pressed(bool pressed);
 
 	/// Change the background style of the button.
-	void set_background_style(UI::ButtonStyle bstyle);
+	void set_style(UI::ButtonStyle bstyle);
 
 	/// Convenience function. Toggles between raised and permpressed style
 	void toggle();
@@ -172,7 +172,7 @@
 	std::string title_;         //  title string used when title_image_ == nullptr
 	const Image* title_image_;  //  custom icon on the button
 
-	const UI::PanelStyleInfo* background_style_;  // Background color and texture. Not owned.
+	const UI::ButtonStyleInfo* style_;  // Background color and texture. Not owned.
 };
 
 }  // namespace UI
 
=== modified file 'src/ui_basic/checkbox.cc'
--- src/ui_basic/checkbox.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/checkbox.cc	2019-05-26 02:00:17 +0000
@@ -80,7 +80,7 @@
 		}
 		rendered_text_ = label_text_.empty() ?
 		                    nullptr :
-		                    UI::g_fh->render(as_uifont(label_text_), text_width(get_w(), pic_width));
+		                    UI::g_fh->render(as_richtext_paragraph(label_text_, UI::FontStyle::kLabel), text_width(get_w(), pic_width));
 		if (rendered_text_.get()) {
 			w = std::max(rendered_text_->width() + kPadding + pic_width, w);
 			h = std::max(rendered_text_->height(), h);
 
=== modified file 'src/ui_basic/dropdown.cc'
--- src/ui_basic/dropdown.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/dropdown.cc	2019-05-26 02:00:17 +0000
@@ -29,18 +29,25 @@
 #include "graphic/font_handler.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/text_layout.h"
 #include "ui_basic/mouse_constants.h"
 #include "ui_basic/tabpanel.h"
 #include "ui_basic/window.h"
 
 namespace {
-
-int base_height(int button_dimension) {
-	return std::max(
+int base_height(int button_dimension, UI::PanelStyle style) {
+	int result = std::max(
 	   button_dimension,
-	   UI::g_fh->render(as_uifont(UI::g_fh->fontset()->representative_character()))->height() + 2);
-}
-
+	   text_height(g_gr->styles().table_style(style).enabled()) + 2);
+	return result;
+}
+
+
+/*
+int BaseDropdown::base_height(int button_dimension) const {
+	return std::max(button_dimension, text_height(g_gr->styles().table_style(UI::PanelStyle::kWui).enabled()) + 2);
+}
+*/
 }  // namespace
 
 namespace UI {
@@ -61,13 +68,14 @@
                y,
                type == DropdownType::kPictorial ? button_dimension : w,
                // Height only to fit the button, so we can use this in Box layout.
-               base_height(button_dimension)),
+               base_height(button_dimension, style)),
      id_(next_id_++),
      max_list_height_(h - 2 * get_h()),
      list_width_(w),
      list_offset_x_(0),
      list_offset_y_(0),
      button_dimension_(button_dimension),
+	 base_height_(base_height(button_dimension, style)),
      mouse_tolerance_(50),
      button_box_(this, 0, 0, UI::Box::Horizontal, w, h),
      push_button_(type == DropdownType::kTextual ?
@@ -154,16 +162,16 @@
 }
 
 void BaseDropdown::set_height(int height) {
-	max_list_height_ = height - base_height(button_dimension_);
+	max_list_height_ = height - base_height_;
 	layout();
 }
 
 void BaseDropdown::set_max_items(int items) {
-	set_height(list_->get_lineheight() * items + base_height(button_dimension_));
+	set_height(list_->get_lineheight() * items + base_height_);
 }
 
 void BaseDropdown::layout() {
-	const int base_h = base_height(button_dimension_);
+	const int base_h = base_height_;
 	const int w = type_ == DropdownType::kPictorial ? button_dimension_ : get_w();
 	button_box_.set_size(w, base_h);
 	display_button_.set_desired_size(
 
=== modified file 'src/ui_basic/dropdown.h'
--- src/ui_basic/dropdown.h	2019-02-23 11:00:49 +0000
+++ src/ui_basic/dropdown.h	2019-05-26 02:00:17 +0000
@@ -179,7 +179,8 @@
 	int list_width_;
 	int list_offset_x_;
 	int list_offset_y_;
-	int button_dimension_;
+	const int button_dimension_;
+	const int base_height_;
 	const int mouse_tolerance_;  // Allow mouse outside the panel a bit before autocollapse
 	UI::Box button_box_;
 	UI::Button* push_button_;  // Only used in textual dropdowns
 
=== modified file 'src/ui_basic/editbox.cc'
--- src/ui_basic/editbox.cc	2019-05-25 08:25:55 +0000
+++ src/ui_basic/editbox.cc	2019-05-26 02:00:17 +0000
@@ -34,7 +34,6 @@
 #include "graphic/text/bidi.h"
 #include "graphic/text/font_set.h"
 #include "graphic/text/rt_errors.h"
-#include "graphic/text_constants.h"
 #include "graphic/text_layout.h"
 #include "ui_basic/mouse_constants.h"
 
@@ -43,23 +42,30 @@
 namespace {
 
 constexpr int kMarginX = 4;
+constexpr int kLineMargin = 1;
 
 }  // namespace
 
 namespace UI {
 
 struct EditBoxImpl {
-	/**
-	 * Font used for rendering text.
-	 */
-	/*@{*/
-	std::string fontname;
-	uint32_t fontsize;
-	/*@}*/
+	explicit EditBoxImpl(const UI::TextPanelStyleInfo& init_style) :
+		background_style(&init_style.background()), font_style(&init_style.font()),
+		margin(init_style.background().margin()), font_scale(1.0f) {
+	}
 
 	/// Background color and texture
 	const UI::PanelStyleInfo* background_style;
 
+	/// Font style
+	const UI::FontStyleInfo* font_style;
+
+	/// Margin around the test
+	int margin;
+
+	/// Scale for font size
+	float font_scale;
+
 	/// Maximum number of characters in the input
 	uint32_t maxLength;
 
@@ -80,22 +86,17 @@
                  int32_t x,
                  int32_t y,
                  uint32_t w,
-                 uint32_t h,
-                 int margin_y,
-                 UI::PanelStyle style,
-                 int font_size)
-   : Panel(parent, x, y, w, h > 0 ? h : text_height(font_size) + 2 * margin_y),
-     m_(new EditBoxImpl),
+                 UI::PanelStyle style)
+   : Panel(parent, x, y, w,
+		   text_height(g_gr->styles().editbox_style(style).font())
+		   + 2 * g_gr->styles().editbox_style(style).background().margin()),
+	 m_(new EditBoxImpl(g_gr->styles().editbox_style(style))),
      history_active_(false),
      history_position_(-1),
      password_(false),
      warning_(false) {
 	set_thinks(false);
 
-	m_->background_style = g_gr->styles().editbox_style(style);
-	m_->fontname = UI::g_fh->fontset()->sans();
-	m_->fontsize = font_size;
-
 	// Set alignment to the UI language's principal writing direction
 	m_->align = UI::g_fh->fontset()->is_rtl() ? UI::Align::kRight : UI::Align::kLeft;
 	m_->caret = 0;
@@ -103,6 +104,7 @@
 	// yes, use *signed* max as maximum length; just a small safe-guard.
 	set_max_length(std::numeric_limits<int32_t>::max());
 
+	set_thinks(false);
 	set_handle_mouse(true);
 	set_can_focus(true);
 	set_handle_textinput();
@@ -148,9 +150,9 @@
  * If the current string is longer than the new maximum length,
  * its end is cut off to fit into the maximum length.
  */
-void EditBox::set_max_length(uint32_t const n) {
+void EditBox::set_max_length(int const n) {
 	m_->maxLength =
-	   std::min(g_gr->max_texture_size_for_font_rendering() / text_height(), static_cast<int>(n));
+	   std::min(g_gr->max_texture_size_for_font_rendering() / text_height(*m_->font_style), n);
 
 	if (m_->text.size() > m_->maxLength) {
 		m_->text.erase(m_->text.begin() + m_->maxLength, m_->text.end());
@@ -161,6 +163,22 @@
 	}
 }
 
+void EditBox::set_font_scale(float scale) {
+	m_->font_scale = scale;
+}
+
+void EditBox::set_font_style(const UI::FontStyleInfo& style) {
+	m_->font_style = &style;
+	const int new_height = text_height(style) + 2 * m_->margin;
+	set_size(get_w(), new_height);
+	set_desired_size(get_w(), new_height);
+}
+
+void EditBox::set_font_style_and_margin(const UI::FontStyleInfo& style, int margin) {
+	m_->margin = margin;
+	set_font_style(style);
+}
+
 /**
  * The mouse was clicked on this editbox
  */
@@ -389,12 +407,13 @@
 	}
 
 	const int max_width = get_w() - 2 * kMarginX;
-
+	FontStyleInfo scaled_style(*m_->font_style);
+	scaled_style.set_size(scaled_style.size() * m_->font_scale);
 	std::shared_ptr<const UI::RenderedText> rendered_text =
-	   UI::g_fh->render(as_editorfont(m_->text, m_->fontsize));
+	   UI::g_fh->render(as_editor_richtext_paragraph(password_ ? text_to_asterisk() : m_->text, scaled_style));
 
 	const int linewidth = rendered_text->width();
-	const int lineheight = m_->text.empty() ? text_height(m_->fontsize) : rendered_text->height();
+	const int lineheight = m_->text.empty() ? text_height(scaled_style) : rendered_text->height();
 
 	Vector2i point(kMarginX, get_h() / 2);
 	if (m_->align == UI::Align::kRight) {
@@ -403,33 +422,27 @@
 	UI::center_vertically(lineheight, &point);
 
 	// Crop to max_width while blitting
-	if (!password_) {
-		if (max_width < linewidth) {
-			// Fix positioning for BiDi languages.
-			if (UI::g_fh->fontset()->is_rtl()) {
-				point.x = 0.f;
-			}
-			// We want this always on, e.g. for mixed language savegame filenames
-			if (i18n::has_rtl_character(m_->text.c_str(), 100)) {  // Restrict check for efficiency
+	if (max_width < linewidth) {
+		// Fix positioning for BiDi languages.
+		if (UI::g_fh->fontset()->is_rtl()) {
+			point.x = 0.f;
+		}
+		// We want this always on, e.g. for mixed language savegame filenames
+		if (i18n::has_rtl_character(m_->text.c_str(), 100)) {  // Restrict check for efficiency
+			// TODO(GunChleoc): Arabic: Fix scrolloffset
+			rendered_text->draw(dst, point, Recti(linewidth - max_width, 0, linewidth, lineheight));
+		} else {
+			if (m_->align == UI::Align::kRight) {
 				// TODO(GunChleoc): Arabic: Fix scrolloffset
-				rendered_text->draw(dst, point, Recti(linewidth - max_width, 0, linewidth, lineheight));
+				rendered_text->draw(
+				   dst, point,
+				   Recti(point.x + m_->scrolloffset + kMarginX, 0, max_width, lineheight));
 			} else {
-				if (m_->align == UI::Align::kRight) {
-					// TODO(GunChleoc): Arabic: Fix scrolloffset
-					rendered_text->draw(
-					   dst, point,
-					   Recti(point.x + m_->scrolloffset + kMarginX, 0, max_width, lineheight));
-				} else {
-					rendered_text->draw(dst, point, Recti(-m_->scrolloffset, 0, max_width, lineheight));
-				}
+				rendered_text->draw(dst, point, Recti(-m_->scrolloffset, 0, max_width, lineheight));
 			}
-		} else {
-			rendered_text->draw(dst, point, Recti(0, 0, max_width, lineheight));
 		}
 	} else {
-		std::shared_ptr<const UI::RenderedText> password_text =
-		   UI::g_fh->render(as_editorfont(text_to_asterisk(), m_->fontsize));
-		password_text->draw(dst, point, Recti(0, 0, max_width, lineheight));
+		rendered_text->draw(dst, point, Recti(0, 0, max_width, lineheight));
 	}
 
 	if (has_focus()) {
@@ -443,9 +456,9 @@
 		}
 
 		// TODO(GunChleoc): Arabic: Fix cursor position for BIDI text.
-		int caret_x = text_width(line_to_caret, m_->fontsize);
+		int caret_x = text_width(line_to_caret, *m_->font_style, m_->font_scale);
 
-		const uint16_t fontheight = text_height(m_->fontsize);
+		const uint16_t fontheight = text_height(*m_->font_style, m_->font_scale);
 
 		const Image* caret_image = g_gr->images().get("images/ui_basic/caret.png");
 		Vector2i caretpt = Vector2i::zero();
@@ -461,8 +474,8 @@
 void EditBox::check_caret() {
 	std::string leftstr(m_->text, 0, m_->caret);
 	std::string rightstr(m_->text, m_->caret, std::string::npos);
-	int32_t leftw = text_width(leftstr, m_->fontsize);
-	int32_t rightw = text_width(rightstr, m_->fontsize);
+	int32_t leftw = text_width(leftstr, *m_->font_style, m_->font_scale);
+	int32_t rightw = text_width(rightstr, *m_->font_style, m_->font_scale);
 
 	int32_t caretpos = 0;
 
 
=== modified file 'src/ui_basic/editbox.h'
--- src/ui_basic/editbox.h	2019-05-15 09:58:33 +0000
+++ src/ui_basic/editbox.h	2019-05-26 02:00:17 +0000
@@ -26,6 +26,7 @@
 #include <boost/signals2.hpp>
 
 #include "graphic/align.h"
+#include "graphic/style_manager.h"
 #include "ui_basic/button.h"
 
 #define CHAT_HISTORY_SIZE 5
@@ -48,10 +49,7 @@
 	        int32_t x,
 	        int32_t y,
 	        uint32_t w,
-	        uint32_t h,
-	        int margin_y,
-	        UI::PanelStyle style,
-	        int font_size = UI_FONT_SIZE_SMALL);
+	        UI::PanelStyle style);
 	~EditBox() override;
 
 	boost::signals2::signal<void()> changed;
@@ -60,7 +58,10 @@
 
 	const std::string& text() const;
 	void set_text(const std::string&);
-	void set_max_length(uint32_t);
+	void set_max_length(int);
+	void set_font_scale(float scale);
+	void set_font_style(const UI::FontStyleInfo& style);
+	void set_font_style_and_margin(const UI::FontStyleInfo& style, int margin);
 
 	void activate_history(bool activate) {
 		history_active_ = activate;
 
=== modified file 'src/ui_basic/fullscreen_window.cc'
--- src/ui_basic/fullscreen_window.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/fullscreen_window.cc	2019-05-26 02:00:17 +0000
@@ -22,9 +22,9 @@
 #include <cstdio>
 #include <memory>
 
+#include "base/log.h"
 #include "graphic/rendertarget.h"
 #include "graphic/style_manager.h"
-#include "graphic/text_constants.h"
 
 /*
 ==============================================================================
@@ -177,12 +177,8 @@
 	}
 }
 
-int FullscreenWindow::fs_small() {
-	return UI_FONT_SIZE_SMALL * get_h() / 600;
-}
-
-int FullscreenWindow::fs_big() {
-	return UI_FONT_SIZE_BIG * get_h() / 600;
+float FullscreenWindow::scale_factor() const {
+	return std::max(1.0f, get_h() / 600.0f);
 }
 
 }  // namespace UI
 
=== modified file 'src/ui_basic/fullscreen_window.h'
--- src/ui_basic/fullscreen_window.h	2019-02-23 11:00:49 +0000
+++ src/ui_basic/fullscreen_window.h	2019-05-26 02:00:17 +0000
@@ -71,9 +71,8 @@
 	FullscreenWindow();
 	~FullscreenWindow() override;
 
-	/// \return the size for texts fitting to current resolution
-	int fs_small();
-	int fs_big();
+	/// \return the font size scale factor for fitting texts to current resolution
+	float scale_factor() const;
 
 protected:
 	void draw(RenderTarget&) override;
 
=== modified file 'src/ui_basic/listselect.cc'
--- src/ui_basic/listselect.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/listselect.cc	2019-05-26 02:00:17 +0000
@@ -30,7 +30,6 @@
 #include "graphic/rendertarget.h"
 #include "graphic/style_manager.h"
 #include "graphic/text/bidi.h"
-#include "graphic/text_constants.h"
 #include "graphic/text_layout.h"
 #include "ui_basic/mouse_constants.h"
 
@@ -54,16 +53,17 @@
                                UI::PanelStyle style,
                                const ListselectLayout selection_mode)
    : Panel(parent, x, y, w, h),
-     lineheight_(text_height() + kMargin),
      scrollbar_(this, get_w() - Scrollbar::kSize, 0, Scrollbar::kSize, h, style),
      scrollpos_(0),
      selection_(no_selection_index()),
      last_click_time_(-10000),
      last_selection_(no_selection_index()),
      selection_mode_(selection_mode),
+	  font_style_(&g_gr->styles().table_style(style).enabled()),
      background_style_(selection_mode == ListselectLayout::kDropdown ?
                           g_gr->styles().dropdown_style(style) :
-                          nullptr) {
+								  nullptr),
+	  lineheight_(text_height(*font_style_) + kMargin) {
 	set_thinks(false);
 
 	scrollbar_.moved.connect(boost::bind(&BaseListselect::set_scrollpos, this, _1));
@@ -297,7 +297,7 @@
 		for (size_t i = 0; i < entry_records_.size(); ++i) {
 			const EntryRecord& er = *entry_records_[i];
 			std::shared_ptr<const UI::RenderedText> rendered_text = UI::g_fh->render(
-			   as_uifont(richtext_escape(er.name), UI_FONT_SIZE_SMALL, UI_FONT_CLR_FG));
+			   as_richtext_paragraph(richtext_escape(er.name), *font_style_));
 			int picw = max_pic_width_ ? max_pic_width_ + 10 : 0;
 			int difference = rendered_text->width() + picw + 8 - get_eff_w();
 			if (difference > 0) {
@@ -342,7 +342,7 @@
 
 		const EntryRecord& er = *entry_records_[idx];
 		std::shared_ptr<const UI::RenderedText> rendered_text =
-		   UI::g_fh->render(as_uifont(richtext_escape(er.name), UI_FONT_SIZE_SMALL, UI_FONT_CLR_FG));
+		   UI::g_fh->render(as_richtext_paragraph(richtext_escape(er.name), *font_style_));
 
 		int lineheight = std::max(get_lineheight(), rendered_text->height());
 
 
=== modified file 'src/ui_basic/listselect.h'
--- src/ui_basic/listselect.h	2019-02-23 11:00:49 +0000
+++ src/ui_basic/listselect.h	2019-05-26 02:00:17 +0000
@@ -26,6 +26,7 @@
 #include <boost/signals2.hpp>
 
 #include "graphic/color.h"
+#include "graphic/styles/font_style.h"
 #include "ui_basic/panel.h"
 #include "ui_basic/scrollbar.h"
 
@@ -139,7 +140,6 @@
 	using EntryRecordDeque = std::deque<EntryRecord*>;
 
 	int max_pic_width_;
-	int lineheight_;
 	EntryRecordDeque entry_records_;
 	Scrollbar scrollbar_;
 	uint32_t scrollpos_;  //  in pixels
@@ -148,7 +148,9 @@
 	uint32_t last_selection_;  // for double clicks
 	ListselectLayout selection_mode_;
 	const Image* check_pic_;
+	const FontStyleInfo* font_style_;
 	const UI::PanelStyleInfo* background_style_;  // Background color and texture. Not owned.
+	int lineheight_;
 	std::string current_tooltip_;
 };
 
 
=== modified file 'src/ui_basic/messagebox.cc'
--- src/ui_basic/messagebox.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/messagebox.cc	2019-05-26 02:00:17 +0000
@@ -22,6 +22,7 @@
 #include "base/i18n.h"
 #include "graphic/font_handler.h"
 #include "graphic/graphic.h"
+#include "graphic/text_layout.h"
 #include "ui_basic/window.h"
 
 namespace UI {
@@ -44,19 +45,21 @@
 	// Make sure that there is space for buttons + message, but not too tall
 	const int maxheight = std::min(260, std::max(outerheight * 2 / 3, 200));
 
+	const UI::FontStyle font_style = UI::FontStyle::kLabel;
+
 	const int margin = 5;
 	int width, height = 0;
 	{
 		std::shared_ptr<const UI::RenderedText> temp_rendered_text =
-		   g_fh->render(as_uifont(text), maxwidth);
+		   g_fh->render(as_richtext_paragraph(text, font_style), maxwidth);
 		width = temp_rendered_text->width();
 		height = temp_rendered_text->height();
 	}
 
 	// Stupid heuristic to avoid excessively long lines
-	if (height < 2 * UI_FONT_SIZE_SMALL) {
+	if (height < 2 * text_height(font_style)) {
 		std::shared_ptr<const UI::RenderedText> temp_rendered_text =
-		   g_fh->render(as_uifont(text), maxwidth / 2);
+		   g_fh->render(as_richtext_paragraph(text, font_style), maxwidth / 2);
 		width = temp_rendered_text->width();
 		height = temp_rendered_text->height();
 	}
 
=== modified file 'src/ui_basic/multilineeditbox.cc'
--- src/ui_basic/multilineeditbox.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/multilineeditbox.cc	2019-05-26 02:00:17 +0000
@@ -41,8 +41,8 @@
 	/// The text in the edit box
 	std::string text;
 
-	/// Background color and texture
-	const UI::PanelStyleInfo* background_style;
+	/// Background color and texture + font style
+	const UI::TextPanelStyleInfo& style;
 
 	/// Position of the cursor inside the text.
 	/// 0 indicates that the cursor is before the first character,
@@ -60,7 +60,7 @@
 	WordWrap ww;
 	/*@}*/
 
-	Data(MultilineEditbox&, const UI::PanelStyleInfo* style);
+	Data(MultilineEditbox&, const TextPanelStyleInfo& style);
 	void refresh_ww();
 
 	void update();
@@ -81,7 +81,7 @@
 
 /**
  * Initialize an editbox that supports multiline strings.
- */
+*/
 MultilineEditbox::MultilineEditbox(
    Panel* parent, int32_t x, int32_t y, uint32_t w, uint32_t h, UI::PanelStyle style)
    : Panel(parent, x, y, w, h), d_(new Data(*this, g_gr->styles().editbox_style(style))) {
@@ -91,17 +91,18 @@
 	set_handle_textinput();
 }
 
-MultilineEditbox::Data::Data(MultilineEditbox& o, const UI::PanelStyleInfo* style)
+MultilineEditbox::Data::Data(MultilineEditbox& o, const UI::TextPanelStyleInfo& init_style)
    : scrollbar(
         &o, o.get_w() - Scrollbar::kSize, 0, Scrollbar::kSize, o.get_h(), UI::PanelStyle::kWui),
-     background_style(style),
+	  style(init_style),
      cursor_pos(0),
-     lineheight(text_height()),
+     lineheight(text_height(style.font())),
      maxbytes(std::min(g_gr->max_texture_size_for_font_rendering() *
                           g_gr->max_texture_size_for_font_rendering() /
-                          (text_height() * text_height()),
+                          (text_height(style.font()) * text_height(style.font())),
                        std::numeric_limits<int32_t>::max())),
      ww_valid(false),
+	  ww(style.font().size(), style.font().color(), o.get_w()),
      owner(o) {
 	scrollbar.moved.connect(boost::bind(&MultilineEditbox::scrollpos_changed, &o, _1));
 
@@ -413,7 +414,7 @@
  * Redraw the Editbox
  */
 void MultilineEditbox::draw(RenderTarget& dst) {
-	draw_background(dst, *d_->background_style);
+	draw_background(dst, d_->style.background());
 
 	// Draw border.
 	if (get_w() >= 4 && get_h() >= 4) {
@@ -437,7 +438,6 @@
 	d_->refresh_ww();
 
 	d_->ww.set_draw_caret(has_focus());
-
 	d_->ww.draw(dst, Vector2i(0, -int32_t(d_->scrollbar.get_scrollpos())), UI::Align::kLeft,
 	            has_focus() ? d_->cursor_pos : std::numeric_limits<uint32_t>::max());
 }
 
=== modified file 'src/ui_basic/multilinetextarea.cc'
--- src/ui_basic/multilinetextarea.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/multilinetextarea.cc	2019-05-26 02:00:17 +0000
@@ -23,9 +23,10 @@
 #include <boost/bind.hpp>
 
 #include "graphic/font_handler.h"
+#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/text/bidi.h"
 #include "graphic/text/font_set.h"
-#include "graphic/text_constants.h"
 #include "graphic/text_layout.h"
 
 namespace UI {
@@ -44,19 +45,30 @@
                                      MultilineTextarea::ScrollMode scroll_mode)
    : Panel(parent, x, y, w, h),
      text_(text),
-     color_(UI_FONT_CLR_FG),
+	  style_(&g_gr->styles().font_style(FontStyle::kLabel)),
+	  font_scale_(1.0f),
      align_(align),
      scrollbar_(this, get_w() - Scrollbar::kSize, 0, Scrollbar::kSize, h, style, false) {
 	set_thinks(false);
 
 	scrollbar_.moved.connect(boost::bind(&MultilineTextarea::scrollpos_changed, this, _1));
 
-	scrollbar_.set_singlestepsize(text_height());
+	scrollbar_.set_singlestepsize(text_height(*style_, font_scale_));
 	scrollbar_.set_steps(1);
 	set_scrollmode(scroll_mode);
 	assert(scrollmode_ == MultilineTextarea::ScrollMode::kNoScrolling || Scrollbar::kSize <= w);
 }
 
+void MultilineTextarea::set_style(const UI::FontStyleInfo& style) {
+	style_ = &style;
+	recompute();
+}
+void MultilineTextarea::set_font_scale(float scale) {
+	font_scale_ = scale;
+	scrollbar_.set_singlestepsize(text_height(*style_, font_scale_));
+	recompute();
+}
+
 /**
  * Replace the current text with a new one.
  * Fix up scrolling state if necessary.
@@ -66,11 +78,6 @@
 	recompute();
 }
 
-void MultilineTextarea::set_color(RGBColor fg) {
-	color_ = fg;
-	recompute();
-}
-
 /**
  * Recompute the text rendering or rich-text layouting,
  * and adjust scrollbar settings accordingly.
@@ -129,7 +136,7 @@
 	// Take care of the scrollbar
 	scrollbar_.set_pos(Vector2i(get_w() - Scrollbar::kSize, 0));
 	scrollbar_.set_size(Scrollbar::kSize, get_h());
-	scrollbar_.set_pagesize(get_h() - 2 * UI_FONT_SIZE_BIG);
+	scrollbar_.set_pagesize(get_h() - 2 * style_->size() * font_scale_);
 }
 
 /**
@@ -140,7 +147,7 @@
 		return;
 	}
 	int anchor = 0;
-	Align alignment = mirror_alignment(align_, text_);
+	Align alignment = mirror_alignment(align_, i18n::has_rtl_character(text_.c_str(), 20));
 	switch (alignment) {
 	// TODO(Arty): We might want to revisit this after the font renderer can handle long strings
 	// without whitespaces differently.
@@ -192,7 +199,10 @@
 	// TODO(GunChleoc): Revisit this once the old font renderer is completely gone.
 	boost::replace_all(temp, "\n\n", "<br>&nbsp;<br>");
 	boost::replace_all(temp, "\n", "<br>");
-	return as_aligned(temp, align_, UI_FONT_SIZE_SMALL, color_);
+
+	FontStyleInfo scaled_style(*style_);
+	scaled_style.set_size(std::max(g_gr->styles().minimum_font_size(), static_cast<int>(std::ceil(scaled_style.size() * font_scale_))));
+	return as_richtext_paragraph(temp, scaled_style, align_);
 }
 
 }  // namespace UI
 
=== modified file 'src/ui_basic/multilinetextarea.h'
--- src/ui_basic/multilinetextarea.h	2019-02-23 11:00:49 +0000
+++ src/ui_basic/multilinetextarea.h	2019-05-26 02:00:17 +0000
@@ -23,13 +23,12 @@
 #include <memory>
 
 #include "graphic/align.h"
-#include "graphic/color.h"
+#include "graphic/styles/panel_styles.h"
 #include "graphic/text_layout.h"
 #include "ui_basic/panel.h"
 #include "ui_basic/scrollbar.h"
 
 namespace UI {
-struct Scrollbar;
 
 /**
  * This defines an area, where a text can easily be printed.
@@ -65,7 +64,8 @@
 		return scrollbar_.is_enabled() ? get_w() - Scrollbar::kSize : get_w();
 	}
 
-	void set_color(RGBColor fg);
+	void set_style(const FontStyleInfo& style);
+	void set_font_scale(float scale);
 
 	// Drawing and event handlers
 	void draw(RenderTarget&) override;
@@ -88,10 +88,13 @@
 	 * turns '\\n' into '<br>' tags as needed, then creates the richtext style wrappers.
 	 */
 	std::string make_richtext();
-
 	std::string text_;
-	std::shared_ptr<const UI::RenderedText> rendered_text_;
-	RGBColor color_;
+
+  std::shared_ptr<const UI::RenderedText> rendered_text_;
+
+  const FontStyleInfo* style_;
+  float font_scale_;
+
 	const Align align_;
 
 	Scrollbar scrollbar_;
 
=== modified file 'src/ui_basic/panel.cc'
--- src/ui_basic/panel.cc	2019-04-24 06:01:37 +0000
+++ src/ui_basic/panel.cc	2019-05-26 02:00:17 +0000
@@ -24,7 +24,6 @@
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "graphic/text/font_set.h"
-#include "graphic/text_constants.h"
 #include "graphic/text_layout.h"
 #include "profile/profile.h"
 #include "sound/sound_handler.h"
@@ -458,12 +457,12 @@
 	draw_background(dst, Recti(0, 0, get_w(), get_h()), info);
 }
 void Panel::draw_background(RenderTarget& dst, Recti rect, const UI::PanelStyleInfo& info) {
-	if (info.image != nullptr) {
+	if (info.image() != nullptr) {
 		dst.fill_rect(rect, RGBAColor(0, 0, 0, 255));
-		dst.tile(rect, info.image, Vector2i(get_x(), get_y()));
+		dst.tile(rect, info.image(), Vector2i(get_x(), get_y()));
 	}
-	if (info.color != RGBAColor(0, 0, 0, 0)) {
-		dst.fill_rect(rect, info.color, BlendMode::UseAlpha);
+	if (info.color() != RGBAColor(0, 0, 0, 0)) {
+		dst.fill_rect(rect, info.color(), BlendMode::UseAlpha);
 	}
 }
 
@@ -1082,7 +1081,7 @@
 	RenderTarget& dst = *g_gr->get_render_target();
 	std::string text_to_render = text;
 	if (!is_richtext(text_to_render)) {
-		text_to_render = as_tooltip(text_to_render);
+		text_to_render = as_richtext_paragraph(text_to_render, UI::FontStyle::kTooltip);
 	}
 
 	constexpr uint32_t kTipWidthMax = 360;
 
=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2019-05-05 11:20:18 +0000
+++ src/ui_basic/panel.h	2019-05-26 02:00:17 +0000
@@ -33,7 +33,7 @@
 #include "base/vector.h"
 #include "graphic/align.h"
 #include "graphic/font_handler.h"
-#include "graphic/panel_styles.h"
+#include "graphic/styles/panel_styles.h"
 #include "sound/constants.h"
 
 class RenderTarget;
 
=== modified file 'src/ui_basic/progressbar.cc'
--- src/ui_basic/progressbar.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/progressbar.cc	2019-05-26 02:00:17 +0000
@@ -24,6 +24,7 @@
 #include <boost/format.hpp>
 
 #include "graphic/font_handler.h"
+#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "graphic/text_layout.h"
 
@@ -37,7 +38,7 @@
                          int32_t const w,
                          int32_t const h,
                          uint32_t const orientation)
-   : Panel(parent, x, y, w, h), orientation_(orientation), state_(0), total_(100) {
+   : Panel(parent, x, y, w, h), orientation_(orientation), state_(0), total_(100), style_(g_gr->styles().progressbar_style(UI::PanelStyle::kWui)) {
 }
 
 /**
@@ -66,9 +67,9 @@
 	assert(0 <= fraction);
 	assert(fraction <= 1);
 
-	const RGBColor color = fraction <= 0.33f ?
-	                          RGBColor(255, 0, 0) :
-	                          fraction <= 0.67f ? RGBColor(255, 255, 0) : RGBColor(0, 255, 0);
+	const RGBColor& color = fraction <= 0.33f ? style_.low_color() : fraction <= 0.67f ?
+	                                           style_.medium_color() :
+	                                           style_.high_color();
 
 	// Draw the actual bar
 	if (orientation_ == Horizontal) {
@@ -85,11 +86,8 @@
 	}
 
 	// Print the state in percent without decimal points.
-	const std::string progress_text = (boost::format("<font color=%s>%u%%</font>") %
-	                                   UI_FONT_CLR_BRIGHT.hex_value() % floorf(fraction * 100.f))
-	                                     .str();
 	std::shared_ptr<const UI::RenderedText> rendered_text =
-	   UI::g_fh->render(as_uifont(progress_text));
+	   UI::g_fh->render(as_richtext_paragraph((boost::format("%u%%") % floorf(fraction * 100.f)).str(), style_.font()));
 	Vector2i pos(get_w() / 2, get_h() / 2);
 	UI::center_vertically(rendered_text->height(), &pos);
 	rendered_text->draw(dst, pos, UI::Align::kCenter);
 
=== modified file 'src/ui_basic/progressbar.h'
--- src/ui_basic/progressbar.h	2019-02-23 11:00:49 +0000
+++ src/ui_basic/progressbar.h	2019-05-26 02:00:17 +0000
@@ -20,6 +20,7 @@
 #ifndef WL_UI_BASIC_PROGRESSBAR_H
 #define WL_UI_BASIC_PROGRESSBAR_H
 
+#include "graphic/style_manager.h"
 #include "ui_basic/panel.h"
 
 namespace UI {
@@ -58,6 +59,7 @@
 	uint32_t orientation_;
 	uint32_t state_;  ///< state_ is [0..total_]
 	uint32_t total_;  ///< maximum progress
+	const UI::ProgressbarStyleInfo& style_;
 };
 }  // namespace UI
 
 
=== modified file 'src/ui_basic/progresswindow.cc'
--- src/ui_basic/progresswindow.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/progresswindow.cc	2019-05-26 02:00:17 +0000
@@ -28,14 +28,10 @@
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "graphic/text/font_set.h"
-#include "graphic/text_constants.h"
 #include "graphic/text_layout.h"
 #include "io/filesystem/layered_filesystem.h"
 
 namespace {
-
-#define PROGRESS_FONT_COLOR_FG RGBColor(128, 128, 255)
-#define PROGRESS_FONT_COLOR_BG RGBColor(64, 64, 0)
 #define PROGRESS_STATUS_RECT_PADDING 2
 #define PROGRESS_STATUS_BORDER_X 2
 #define PROGRESS_STATUS_BORDER_Y 2
@@ -46,7 +42,7 @@
 namespace UI {
 
 ProgressWindow::ProgressWindow(const std::string& background)
-   : UI::FullscreenWindow(), label_center_(Vector2i::zero()) {
+   : UI::FullscreenWindow(), label_center_(Vector2i::zero()), style_(g_gr->styles().progressbar_style(UI::PanelStyle::kFsMenu)) {
 	set_background(background);
 	step(_("Loading…"));
 }
@@ -63,7 +59,7 @@
 	label_center_.x = get_w() / 2;
 	label_center_.y = get_h() * PROGRESS_LABEL_POSITION_Y / 100;
 
-	const uint32_t h = text_height();
+	const uint32_t h = text_height(style_.font());
 
 	label_rectangle_.x = get_w() / 4;
 	label_rectangle_.w = get_w() / 2;
@@ -76,7 +72,9 @@
 	border_rect.w += 2 * PROGRESS_STATUS_BORDER_X;
 	border_rect.h += 2 * PROGRESS_STATUS_BORDER_Y;
 
-	rt.draw_rect(border_rect, PROGRESS_FONT_COLOR_FG);
+	rt.draw_rect(border_rect, style_.font().color());
+	// TODO(GunChleoc): this should depend on actual progress. Add a total steps variable and reuse the Progressbar class.
+	rt.fill_rect(label_rectangle_, style_.medium_color());
 }
 
 /// Set a picture to render in the background
@@ -97,9 +95,8 @@
 	// always repaint the background first
 	draw(rt);
 
-	rt.fill_rect(label_rectangle_, PROGRESS_FONT_COLOR_BG);
 	std::shared_ptr<const UI::RenderedText> rendered_text =
-	   UI::g_fh->render(as_uifont(description, UI_FONT_SIZE_SMALL, PROGRESS_FONT_COLOR_FG));
+	   UI::g_fh->render(as_richtext_paragraph(description, style_.font()));
 	UI::center_vertically(rendered_text->height(), &label_center_);
 	rendered_text->draw(rt, label_center_, UI::Align::kCenter);
 
 
=== modified file 'src/ui_basic/progresswindow.h'
--- src/ui_basic/progresswindow.h	2019-02-23 11:00:49 +0000
+++ src/ui_basic/progresswindow.h	2019-05-26 02:00:17 +0000
@@ -67,6 +67,7 @@
 	Recti label_rectangle_;
 	VisualizationArray visualizations_;
 	std::string background_;
+	const UI::ProgressbarStyleInfo& style_;
 
 	void draw(RenderTarget&) override;
 	void update(bool repaint);
 
=== modified file 'src/ui_basic/slider.cc'
--- src/ui_basic/slider.cc	2019-03-16 07:46:10 +0000
+++ src/ui_basic/slider.cc	2019-05-26 02:00:17 +0000
@@ -72,7 +72,7 @@
      highlighted_(false),
      pressed_(false),
      enabled_(enabled),
-     cursor_style_(g_gr->styles().slider_style(style)),
+     cursor_style_(&g_gr->styles().slider_style(style).background()),
      x_gap_(x_gap),
      y_gap_(y_gap),
      bar_size_(bar_size),
@@ -487,22 +487,23 @@
                                const uint32_t w,
                                const uint32_t h,
                                const std::vector<std::string>& labels_in,
-                               uint32_t value_,
-                               SliderStyle style,
+                               uint32_t init_value,
+                               SliderStyle init_style,
                                const std::string& tooltip_text,
                                const uint32_t cursor_size,
                                const bool enabled)
    : Panel(parent, x, y, w, h, tooltip_text),
+	  style(g_gr->styles().slider_style(init_style)),
      slider(this,
             // here, we take into account the h_gap introduced by HorizontalSlider
             w / (2 * labels_in.size()) - cursor_size / 2,
             0,
             w - (w / labels_in.size()) + cursor_size,
-            h - text_height(UI_FONT_SIZE_SMALL - 2, UI::FontSet::Face::kCondensed) - 2,
+            h - text_height(style.font()) - 2,
             0,
             labels_in.size() - 1,
-            value_,
-            style,
+            init_value,
+            init_style,
             tooltip_text,
             cursor_size,
             enabled),
@@ -524,7 +525,7 @@
 
 	for (uint32_t i = 0; i < labels.size(); i++) {
 		std::shared_ptr<const UI::RenderedText> rendered_text =
-		   UI::g_fh->render(as_condensed(labels[i], UI::Align::kCenter, UI_FONT_SIZE_SMALL - 2));
+		   UI::g_fh->render(as_richtext_paragraph(labels[i], style.font()));
 		rendered_text->draw(
 		   dst, Vector2i(gap_1 + i * gap_n, get_h() - rendered_text->height()), UI::Align::kCenter);
 	}
@@ -542,7 +543,7 @@
 	assert(labels.size());
 	slider.set_pos(Vector2i(w / (2 * labels.size()) - slider.cursor_size_ / 2, 0));
 	slider.set_size(w - (w / labels.size()) + slider.cursor_size_,
-	                h - text_height(UI_FONT_SIZE_SMALL - 2, UI::FontSet::Face::kCondensed) + 2);
+	                h - text_height(style.font()) + 2);
 	Panel::layout();
 }
 }  // namespace UI
 
=== modified file 'src/ui_basic/slider.h'
--- src/ui_basic/slider.h	2019-03-16 07:28:07 +0000
+++ src/ui_basic/slider.h	2019-05-26 02:00:17 +0000
@@ -21,6 +21,7 @@
 
 #include <boost/signals2.hpp>
 
+#include "graphic/styles/text_panel_style.h"
 #include "ui_basic/panel.h"
 
 namespace UI {
@@ -236,6 +237,11 @@
 	void draw(RenderTarget& dst) override;
 	void layout() override;
 
+private:
+	// We need the style to initialize the slider, so it has to come first.
+	const UI::TextPanelStyleInfo& style;
+
+protected:
 	HorizontalSlider slider;
 
 private:
 
=== modified file 'src/ui_basic/spinbox.cc'
--- src/ui_basic/spinbox.cc	2019-02-23 11:00:49 +0000
+++ src/ui_basic/spinbox.cc	2019-05-26 02:00:17 +0000
@@ -31,7 +31,6 @@
 #include "graphic/font_handler.h"
 #include "graphic/graphic.h"
 #include "graphic/text/font_set.h"
-#include "graphic/text_constants.h"
 #include "ui_basic/button.h"
 #include "ui_basic/multilinetextarea.h"
 #include "ui_basic/textarea.h"
 
=== modified file 'src/ui_basic/table.cc'
--- src/ui_basic/table.cc	2019-04-18 16:50:35 +0000
+++ src/ui_basic/table.cc	2019-05-26 02:00:17 +0000
@@ -22,14 +22,13 @@
 #include <boost/bind.hpp>
 
 #include "graphic/font_handler.h"
+#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "graphic/text/bidi.h"
 #include "graphic/text/font_set.h"
-#include "graphic/text_constants.h"
 #include "graphic/text_layout.h"
 #include "graphic/texture.h"
 #include "ui_basic/mouse_constants.h"
-#include "ui_basic/scrollbar.h"
 
 namespace UI {
 
@@ -49,8 +48,9 @@
                     TableRows rowtype)
    : Panel(parent, x, y, w, h),
      total_width_(0),
-     headerheight_(text_height() + 4),
-     lineheight_(text_height()),
+	  lineheight_(text_height(g_gr->styles().table_style(style).enabled())),
+     headerheight_(lineheight_ + 4),
+	  style_(style),
      button_style_(style == UI::PanelStyle::kFsMenu ? UI::ButtonStyle::kFsMenuMenu :
                                                       UI::ButtonStyle::kWuiSecondary),
      scrollbar_(nullptr),
@@ -239,7 +239,7 @@
 		for (uint32_t i = 0, curx = 0; i < nr_columns; ++i) {
 			const Column& column = columns_[i];
 			const int curw = column.width;
-			Align alignment = mirror_alignment(column.alignment);
+			Align alignment = mirror_alignment(column.alignment, g_fh->fontset()->is_rtl());
 
 			const Image* entry_picture = er.get_picture(i);
 			const std::string& entry_string = er.get_string(i);
@@ -300,12 +300,19 @@
 				curx += curw;
 				continue;
 			}
-			std::shared_ptr<const UI::RenderedText> rendered_text = UI::g_fh->render(
-			   as_uifont(richtext_escape(entry_string), UI_FONT_SIZE_SMALL, er.get_color()));
+
+			const UI::FontStyleInfo& font_style =
+					er.font_style() != nullptr ?
+										   *er.font_style() :
+										   er.is_disabled() ?
+											   g_gr->styles().table_style(style_).disabled() :
+											   g_gr->styles().table_style(style_).enabled();
+			std::shared_ptr<const UI::RenderedText> rendered_text =
+			   UI::g_fh->render(as_richtext_paragraph(richtext_escape(entry_string), font_style));
 
 			// Fix text alignment for BiDi languages if the entry contains an RTL character. We want
 			// this always on, e.g. for mixed language savegame filenames.
-			alignment = mirror_alignment(column.alignment, entry_string);
+			alignment = mirror_alignment(column.alignment, i18n::has_rtl_character(entry_string.c_str(), 20));
 
 			// Position the text according to alignment
 			switch (alignment) {
@@ -718,7 +725,7 @@
 	return ea.get_string(column) < eb.get_string(column);
 }
 
-Table<void*>::EntryRecord::EntryRecord(void* const e) : entry_(e), clr(UI_FONT_CLR_FG) {
+Table<void*>::EntryRecord::EntryRecord(void* const e) : entry_(e), font_style_(nullptr), disabled_(false) {
 }
 
 void Table<void*>::EntryRecord::set_picture(uint8_t const col,
 
=== modified file 'src/ui_basic/table.h'
--- src/ui_basic/table.h	2019-04-18 16:50:35 +0000
+++ src/ui_basic/table.h	2019-05-26 02:00:17 +0000
@@ -29,12 +29,12 @@
 
 #include "graphic/align.h"