Merge lp:~widelands-dev/widelands/background_images into lp:widelands

[GunChleoc]

Use Lua to define background and button styles

- Background images and colors are now defined in data/templates/default
- Combine common background graphics with color overlays
- Added StyleManager class to load and access backgrounds
- Downscale background images (e.g. campaign maps) on small screens
- New graphics for ui_fsmenu
- Darker background for wui elements

Use Lua to define background and button styles

The icing on the cake would be to use RGBA color instead of RGB for the color overlays, but I couldn't get it to work.

[kaputtnik (franku)]

Uff, this is a big change :-D Needs a bit familiarization...

In general i think the new background is better, because it is less noisy. After playing around with the main menus and in game menus i think two colors need a bit tweaking:

The bluish buttons appears on one of my monitors more petrol colored. Maybe add a bit more blue?
The background of the stock has a touch of violet. Reduce red?

Just my opinion :-)

Is there a possibility to play with the colors without restarting widelands every time? I have tried with gimp, but the rgb-values provided in the lua file look totally different over there.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3180. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/341039129.
Appveyor build 2987. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_background_images-2987.

[GunChleoc (gunchleoc)]

All we have of the old fullscreen graphics are some flattend jpg files dating back to sourceforge, so the only way to go ahead was to completely redo the graphics. I showed some screen shots last summer on the forum: https://wl.widelands.org/forum/topic/2881/

I'd be happy to have someone help with tweaking the colors :)

Sorry, but reloading the graphics in-game is not trivial.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3206. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/342943879.
Appveyor build 3015. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_background_images-3015.

[kaputtnik (franku)]

Let's do a try for other coloring in a different branch :-)

I have tested this branch by playing a game, check editor and opened all dialogs. So i think this could be merged without a code review?

review: Approve (testing)

[GunChleoc (gunchleoc)]

No code review is dangerous. I'd like to have at least src/graphic/style_manager reviewed.

[GunChleoc (gunchleoc)]

I have committed my graphics source files to the media repository now: https://bazaar.launchpad.net/~widelands-media-dev/widelands-media/widelands-media/files/head:/graphics/user_interface/ui_fsmenu/

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3396. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/369727261.
Appveyor build 3202. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_background_images-3202.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3433. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/373592122.
Appveyor build 3238. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_background_images-3238.

[Benedikt Straub (nordfriese)]

As far as I can judge, this should work fine. Didn´t test it though.

I mainly checked the logic behind the code and found nothing that can go wrong; if it compiles and works, I guess there are no problems c++-wise either.
I reviewed style_manager.*, panel_styles.h, the drawing-related functions and the lua script; the rest is just moving some pieces of code and converting all UI elements to the new style definitions, isn´t it?

review: Approve (review)

[GunChleoc (gunchleoc)]

Yes it is, thanks for the review!

I want to give this a final test under Windows before I merge.

[GunChleoc (gunchleoc)]

This crashes on my Windows without any indication of what's wrong in the log.

[Benedikt Straub (nordfriese)]

I compiled the branch and I can reproduce the crash.
Assert fail and backtrace (if you didn´t debug it already :) ):

widelands: ../src/graphic/graphic.cc:111: void Graphic::initialize(const Graphic::TraceGl&, int, int, bool): Assertion `SDL_BYTESPERPIXEL(disp_mode.format) == 4' failed.

Program received signal SIGABRT, Aborted.
0xb7fd6d09 in __kernel_vsyscall ()
(gdb) bt
#0 0xb7fd6d09 in __kernel_vsyscall ()
#1 0xb759a832 in __libc_signal_restore_set (set=0xbfffeabc) at ../sysdeps/unix/sysv/linux/nptl-signals.h:80
#2 __GI_raise (sig=6) at ../sysdeps/unix/sysv/linux/raise.c:48
#3 0xb759bcc1 in __GI_abort () at abort.c:79
#4 0xb75927bb in __assert_fail_base (fmt=0xb76ee848 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n",
    assertion=0x1463c28 "SDL_BYTESPERPIXEL(disp_mode.format) == 4", file=0x1463b66 "../src/graphic/graphic.cc", line=111,
    function=0x1463d00 <Graphic::initialize(Graphic::TraceGl const&, int, int, bool)::__PRETTY_FUNCTION__> "void Graphic::initialize(const Graphic::TraceGl&, int, int, bool)") at assert.c:92
#5 0xb7592819 in __GI___assert_fail (assertion=0x1463c28 "SDL_BYTESPERPIXEL(disp_mode.format) == 4",
    file=0x1463b66 "../src/graphic/graphic.cc", line=111,
    function=0x1463d00 <Graphic::initialize(Graphic::TraceGl const&, int, int, bool)::__PRETTY_FUNCTION__> "void Graphic::initialize(const Graphic::TraceGl&, int, int, bool)") at assert.c:101
#6 0x00d8ec6b in Graphic::initialize (this=0x1b39b20, trace_gl=@0xbfffeecc: Graphic::TraceGl::kNo, window_mode_w=1270, window_mode_h=1710,
    init_fullscreen=false) at ../src/graphic/graphic.cc:111
#7 0x00cbe0e2 in WLApplication::WLApplication (this=0x19bd5c0, argc=1, argv=0xbffff074) at ../src/wlapplication.cc:343
#8 0x00cbd8f1 in WLApplication::get (argc=1, argv=0xbffff074) at ../src/wlapplication.cc:262
#9 0x00cbca29 in main (argc=1, argv=0xbffff074) at ../src/main.cc:47

No idea what´s going wrong here...

review: Needs Fixing

[GunChleoc (gunchleoc)]

Thanks! All I could get out of gdb on Windows is error code 3... I did some changes to the initialize function, so that's a place to start.

I am also trying to set up a build environment on Windows, but I'm still busy with compiling the libraries...

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3498. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/378009939.
Appveyor build 3303. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_background_images-3303.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3502. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/378103984.
Appveyor build 3307. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_background_images-3307.

[GunChleoc (gunchleoc)]

Fixed it :)

There were 2 problems:

1. Wrong file separator for Windows
2. New directory not added to InnoSetup

@bunnybot merge

=== removed file 'data/images/ui_basic/but0.png'
Binary files data/images/ui_basic/but0.png	2014-12-03 10:10:14 +0000 and data/images/ui_basic/but0.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/images/ui_basic/but1.png'
Binary files data/images/ui_basic/but1.png	2014-12-03 10:10:14 +0000 and data/images/ui_basic/but1.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/images/ui_basic/but2.png'
Binary files data/images/ui_basic/but2.png	2014-12-03 10:10:14 +0000 and data/images/ui_basic/but2.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/images/ui_basic/but3.png'
Binary files data/images/ui_basic/but3.png	2014-12-03 10:10:14 +0000 and data/images/ui_basic/but3.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/images/ui_basic/but4.png'
Binary files data/images/ui_basic/but4.png	2014-12-03 10:10:14 +0000 and data/images/ui_basic/but4.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/images/ui_basic/but5.png'
Binary files data/images/ui_basic/but5.png	2015-10-04 19:26:02 +0000 and data/images/ui_basic/but5.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/images/ui_fsmenu/top_left.png'
Binary files data/images/ui_fsmenu/top_left.png	2016-10-31 08:33:56 +0000 and data/images/ui_fsmenu/top_left.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/images/wui/window_background_dark.png'
Binary files data/images/wui/window_background_dark.png	2016-10-05 08:04:18 +0000 and data/images/wui/window_background_dark.png	1970-01-01 00:00:00 +0000 differ
=== added directory 'data/templates'
=== added directory 'data/templates/default'
=== added directory 'data/templates/default/fsmenu'
=== renamed file 'data/images/ui_fsmenu/background.png' => 'data/templates/default/fsmenu/background.png'
Binary files data/images/ui_fsmenu/background.png	2016-10-31 12:09:15 +0000 and data/templates/default/fsmenu/background.png	2018-05-12 13:15:45 +0000 differ
=== renamed file 'data/images/ui_fsmenu/bottom.png' => 'data/templates/default/fsmenu/bottom.png'
Binary files data/images/ui_fsmenu/bottom.png	2016-10-31 08:33:56 +0000 and data/templates/default/fsmenu/bottom.png	2018-05-12 13:15:45 +0000 differ
=== renamed file 'data/images/ui_fsmenu/bottom_left.png' => 'data/templates/default/fsmenu/bottom_left.png'
Binary files data/images/ui_fsmenu/bottom_left.png	2016-10-31 08:33:56 +0000 and data/templates/default/fsmenu/bottom_left.png	2018-05-12 13:15:45 +0000 differ
=== renamed file 'data/images/ui_fsmenu/bottom_right.png' => 'data/templates/default/fsmenu/bottom_right.png'
Binary files data/images/ui_fsmenu/bottom_right.png	2016-10-31 08:33:56 +0000 and data/templates/default/fsmenu/bottom_right.png	2018-05-12 13:15:45 +0000 differ
=== added file 'data/templates/default/fsmenu/button.png'
Binary files data/templates/default/fsmenu/button.png	1970-01-01 00:00:00 +0000 and data/templates/default/fsmenu/button.png	2018-05-12 13:15:45 +0000 differ
=== renamed file 'data/images/ui_fsmenu/center.png' => 'data/templates/default/fsmenu/center.png'
Binary files data/images/ui_fsmenu/center.png	2016-10-31 08:21:03 +0000 and data/templates/default/fsmenu/center.png	2018-05-12 13:15:45 +0000 differ
=== renamed file 'data/images/ui_fsmenu/left.png' => 'data/templates/default/fsmenu/left.png'
Binary files data/images/ui_fsmenu/left.png	2016-10-31 08:33:56 +0000 and data/templates/default/fsmenu/left.png	2018-05-12 13:15:45 +0000 differ
=== renamed file 'data/images/ui_fsmenu/right.png' => 'data/templates/default/fsmenu/right.png'
Binary files data/images/ui_fsmenu/right.png	2016-10-31 08:33:56 +0000 and data/templates/default/fsmenu/right.png	2018-05-12 13:15:45 +0000 differ
=== renamed file 'data/images/ui_fsmenu/top.png' => 'data/templates/default/fsmenu/top.png'
Binary files data/images/ui_fsmenu/top.png	2016-10-31 08:33:56 +0000 and data/templates/default/fsmenu/top.png	2018-05-12 13:15:45 +0000 differ
=== added file 'data/templates/default/fsmenu/top_left.png'
Binary files data/templates/default/fsmenu/top_left.png	1970-01-01 00:00:00 +0000 and data/templates/default/fsmenu/top_left.png	2018-05-12 13:15:45 +0000 differ
=== renamed file 'data/images/ui_fsmenu/top_right.png' => 'data/templates/default/fsmenu/top_right.png'
Binary files data/images/ui_fsmenu/top_right.png	2016-10-31 08:33:56 +0000 and data/templates/default/fsmenu/top_right.png	2018-05-12 13:15:45 +0000 differ
=== added file 'data/templates/default/init.lua'
--- data/templates/default/init.lua	1970-01-01 00:00:00 +0000
+++ data/templates/default/init.lua	2018-05-12 13:15:45 +0000
@@ -0,0 +1,101 @@
+-- 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 } }.
+
+dirname = path.dirname(__file__)
+
+-- Some common elements for reuse
+local fs_button = dirname .. "fsmenu/button.png"
+local wui_button = dirname .. "wui/button.png"
+
+local fs_blue =  {0, 31, 40}
+local fs_green =  {10, 50, 0}
+local fs_brown =  {45, 34, 18}
+
+local wui_light =  {85, 63, 35}
+local wui_green =  {3, 15, 0}
+local wui_brown =  {32, 19, 8}
+
+-- 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
+   buttons = {
+      -- Buttons used in Fullscreen menus
+      fsmenu = {
+         -- Main menu ("Single Player", "Watch Replay", ...)
+         menu = { image = fs_button, color = fs_blue },
+         -- Primary user selection ("OK", ...)
+         primary = { image = fs_button, color = fs_green },
+         -- Secondary user selection ("Cancel", "Delete", selection buttons, ...)
+         secondary = { 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 },
+         -- Primary user selection ("OK", attack, ...)
+         primary = { image = wui_button, color = wui_green },
+         -- Secondary user selection ("Cancel", "Delete", ...)
+         secondary = { 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} },
+      }
+   },
+   -- Slider cursors (Sound control, attack, statistics, ...)
+   sliders = {
+      fsmenu = {
+         menu = { image = fs_button, color = fs_blue },
+      },
+      wui = {
+         -- Sound Options, Statistics
+         light = { image = wui_button, color = wui_brown },
+         -- Fieldaction (attack)
+         dark = { image = wui_button, color = wui_green },
+      }
+   },
+   -- Background for tab panels
+   tabpanels = {
+      fsmenu = {
+         -- Options, About, ... this comes with a hard-coded border too
+         menu = { image = "", color = {5, 5, 5} },
+      },
+      wui = {
+         -- Most in-game and in-editor tabs. Building windows, Editor tools,
+         -- Encyclopedia, ...
+         light = { image = "", color = {0, 0, 0} },
+         -- Building buttons in Fieldaction and Building Statistics need a dark
+         -- background, otherwise the icons will be hard to see.
+         dark = { image = wui_button, color = wui_brown },
+      }
+   },
+   -- Used both for one-line and multiline edit boxes
+   editboxes = {
+      fsmenu = {
+         menu = { image = fs_button, color = fs_green },
+      },
+      wui = {
+         menu = { image = wui_button, color = wui_brown },
+      }
+   },
+   -- Background for dropdown menus
+   dropdowns = {
+      fsmenu = {
+         menu = { image = fs_button, color = fs_brown },
+      },
+      wui = {
+         menu = { image = wui_button, color = wui_brown },
+      }
+   },
+   -- Scrollbar buttons, table headers etc.
+   scrollbars = {
+      fsmenu = {
+         menu = { image = fs_button, color = fs_blue },
+      },
+      wui = {
+         menu = { image = wui_button, color = wui_brown },
+      }
+   }
+}

=== added directory 'data/templates/default/wui'
=== renamed file 'data/images/wui/window_background.png' => 'data/templates/default/wui/background.png'
Binary files data/images/wui/window_background.png	2014-12-03 10:43:04 +0000 and data/templates/default/wui/background.png	2018-05-12 13:15:45 +0000 differ
=== renamed file 'data/images/wui/window_bottom.png' => 'data/templates/default/wui/bottom.png'
=== added file 'data/templates/default/wui/button.png'
Binary files data/templates/default/wui/button.png	1970-01-01 00:00:00 +0000 and data/templates/default/wui/button.png	2018-05-12 13:15:45 +0000 differ
=== renamed file 'data/images/wui/window_left.png' => 'data/templates/default/wui/left.png'
=== renamed file 'data/images/wui/window_right.png' => 'data/templates/default/wui/right.png'
=== renamed file 'data/images/wui/window_top.png' => 'data/templates/default/wui/top.png'
=== modified file 'src/editor/tools/decrease_height_tool.cc'
--- src/editor/tools/decrease_height_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/decrease_height_tool.cc	2018-05-12 13:15:45 +0000
@@ -23,7 +23,6 @@
 #include "editor/tools/increase_height_tool.h"
 #include "editor/tools/set_height_tool.h"
 #include "logic/field.h"
-#include "logic/map.h"
 #include "logic/mapregion.h"
 
 /// Decreases the heights by a value. Chages surrounding nodes if necessary.

=== modified file 'src/editor/tools/decrease_resources_tool.cc'
--- src/editor/tools/decrease_resources_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/decrease_resources_tool.cc	2018-05-12 13:15:45 +0000
@@ -22,10 +22,8 @@
 #include "editor/editorinteractive.h"
 #include "editor/tools/increase_resources_tool.h"
 #include "editor/tools/set_resources_tool.h"
-#include "graphic/graphic.h"
 #include "logic/field.h"
 #include "logic/map_objects/world/resource_description.h"
-#include "logic/map_objects/world/world.h"
 #include "logic/mapregion.h"
 #include "logic/widelands_geometry.h"
 

=== modified file 'src/editor/tools/increase_height_tool.cc'
--- src/editor/tools/increase_height_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/increase_height_tool.cc	2018-05-12 13:15:45 +0000
@@ -21,7 +21,6 @@
 
 #include "editor/editorinteractive.h"
 #include "logic/field.h"
-#include "logic/map.h"
 #include "logic/mapregion.h"
 
 /// Increases the heights by a value. Changes surrounding nodes if necessary.

=== modified file 'src/editor/tools/increase_resources_tool.cc'
--- src/editor/tools/increase_resources_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/increase_resources_tool.cc	2018-05-12 13:15:45 +0000
@@ -20,11 +20,9 @@
 #include "editor/tools/increase_resources_tool.h"
 
 #include "editor/editorinteractive.h"
-#include "graphic/graphic.h"
 #include "logic/field.h"
 #include "logic/map_objects/world/resource_description.h"
 #include "logic/map_objects/world/terrain_description.h"
-#include "logic/map_objects/world/world.h"
 #include "logic/mapregion.h"
 
 using Widelands::TCoords;

=== modified file 'src/editor/tools/info_tool.cc'
--- src/editor/tools/info_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/info_tool.cc	2018-05-12 13:15:45 +0000
@@ -26,10 +26,8 @@
 
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
-#include "logic/map.h"
 #include "logic/map_objects/world/editor_category.h"
 #include "logic/map_objects/world/terrain_description.h"
-#include "logic/map_objects/world/world.h"
 #include "ui_basic/multilinetextarea.h"
 #include "ui_basic/window.h"
 
@@ -44,7 +42,7 @@
 	UI::Window* const w =
 	   new UI::Window(&parent, "field_information", 30, 30, 400, 200, _("Field Information"));
 	UI::MultilineTextarea* const multiline_textarea =
-	   new UI::MultilineTextarea(w, 0, 0, w->get_inner_w(), w->get_inner_h());
+	   new UI::MultilineTextarea(w, 0, 0, w->get_inner_w(), w->get_inner_h(), UI::PanelStyle::kWui);
 
 	Widelands::Field& f = (*map)[center.node];
 

=== modified file 'src/editor/tools/place_critter_tool.cc'
--- src/editor/tools/place_critter_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/place_critter_tool.cc	2018-05-12 13:15:45 +0000
@@ -24,7 +24,6 @@
 #include "logic/field.h"
 #include "logic/map_objects/bob.h"
 #include "logic/map_objects/world/critter.h"
-#include "logic/map_objects/world/world.h"
 #include "logic/mapregion.h"
 
 /**

=== modified file 'src/editor/tools/set_height_tool.cc'
--- src/editor/tools/set_height_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/set_height_tool.cc	2018-05-12 13:15:45 +0000
@@ -23,7 +23,6 @@
 #include "editor/tools/decrease_height_tool.h"
 #include "editor/tools/increase_height_tool.h"
 #include "logic/field.h"
-#include "logic/map.h"
 #include "logic/mapregion.h"
 
 int32_t EditorSetHeightTool::handle_click_impl(const Widelands::World& world,

=== modified file 'src/editor/tools/set_origin_tool.cc'
--- src/editor/tools/set_origin_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/set_origin_tool.cc	2018-05-12 13:15:45 +0000
@@ -20,7 +20,6 @@
 #include "editor/tools/set_origin_tool.h"
 
 #include "editor/editorinteractive.h"
-#include "logic/map.h"
 #include "wui/mapviewpixelconstants.h"
 
 int32_t EditorSetOriginTool::handle_click_impl(const Widelands::World&,

=== modified file 'src/editor/tools/set_port_space_tool.cc'
--- src/editor/tools/set_port_space_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/set_port_space_tool.cc	2018-05-12 13:15:45 +0000
@@ -21,7 +21,6 @@
 
 #include "editor/editorinteractive.h"
 #include "editor/tools/tool.h"
-#include "logic/map.h"
 #include "logic/map_objects/tribes/building.h"
 #include "logic/mapfringeregion.h"
 #include "logic/mapregion.h"

=== modified file 'src/editor/tools/set_resources_tool.cc'
--- src/editor/tools/set_resources_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/set_resources_tool.cc	2018-05-12 13:15:45 +0000
@@ -22,10 +22,8 @@
 #include "editor/editorinteractive.h"
 #include "editor/tools/decrease_resources_tool.h"
 #include "editor/tools/increase_resources_tool.h"
-#include "graphic/graphic.h"
 #include "logic/field.h"
 #include "logic/map_objects/world/resource_description.h"
-#include "logic/map_objects/world/world.h"
 #include "logic/mapregion.h"
 
 int32_t EditorSetResourcesTool::handle_click_impl(const Widelands::World& world,

=== modified file 'src/editor/tools/set_starting_pos_tool.cc'
--- src/editor/tools/set_starting_pos_tool.cc	2018-04-07 16:59:00 +0000
+++ src/editor/tools/set_starting_pos_tool.cc	2018-05-12 13:15:45 +0000
@@ -21,9 +21,7 @@
 
 #include "editor/editorinteractive.h"
 #include "editor/tools/tool.h"
-#include "graphic/graphic.h"
 #include "graphic/playercolor.h"
-#include "logic/map.h"
 
 // global variable to pass data from callback to class
 static int32_t current_player_;

=== modified file 'src/editor/tools/tool.h'
--- src/editor/tools/tool.h	2018-04-07 16:59:00 +0000
+++ src/editor/tools/tool.h	2018-05-12 13:15:45 +0000
@@ -24,16 +24,12 @@
 
 #include "base/macros.h"
 #include "editor/tools/action_args.h"
-#include "graphic/graphic.h"
 #include "graphic/image.h"
 #include "logic/editor_game_base.h"
+#include "logic/map_objects/world/world.h"
 #include "logic/widelands_geometry.h"
 
 class EditorInteractive;
-namespace Widelands {
-class Map;
-class World;
-}
 
 /**
  * An editor tool is a tool that can be selected in the editor. Examples are:

=== modified file 'src/editor/ui_menus/categorized_item_selection_menu.h'
--- src/editor/ui_menus/categorized_item_selection_menu.h	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/categorized_item_selection_menu.h	2018-05-12 13:15:45 +0000
@@ -27,7 +27,6 @@
 #include "boost/format.hpp"
 
 #include "base/i18n.h"
-#include "graphic/graphic.h"
 #include "graphic/image.h"
 #include "logic/description_maintainer.h"
 #include "logic/map_objects/world/editor_category.h"
@@ -83,19 +82,17 @@
      descriptions_(descriptions),
      select_correct_tool_(select_correct_tool),
      protect_against_recursive_select_(false),
-     tab_panel_(this, g_gr->images().get("images/wui/window_background_dark.png")),
+     tab_panel_(this, UI::TabPanelStyle::kWuiLight),
      current_selection_names_(this,
                               0,
                               0,
                               20,
                               20,
+                              UI::PanelStyle::kWui,
                               "",
                               UI::Align::kCenter,
-                              g_gr->images().get("images/ui_basic/but1.png"),
                               UI::MultilineTextarea::ScrollMode::kNoScrolling),
      tool_(tool) {
-	current_selection_names_.set_background(
-	   g_gr->images().get("images/wui/window_background_dark.png"));
 	add(&tab_panel_);
 
 	for (uint32_t category_index = 0; category_index < categories.size(); ++category_index) {

=== modified file 'src/editor/ui_menus/main_menu.cc'
--- src/editor/ui_menus/main_menu.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/main_menu.cc	2018-05-12 13:15:45 +0000
@@ -42,54 +42,24 @@
 EditorMainMenu::EditorMainMenu(EditorInteractive& parent, UI::UniqueWindow::Registry& registry)
    : UI::UniqueWindow(&parent, "main_menu", &registry, 2 * margin + width, 0, _("Main Menu")),
      box_(this, margin, margin, UI::Box::Vertical, width, get_h() - 2 * margin, vspacing),
-     button_new_map_(&box_,
-                     "new_map",
-                     0,
-                     0,
-                     width,
-                     0,
-                     g_gr->images().get("images/ui_basic/but1.png"),
-                     _("New Map")),
+     button_new_map_(
+        &box_, "new_map", 0, 0, width, 0, UI::ButtonStyle::kWuiSecondary, _("New Map")),
      button_new_random_map_(&box_,
                             "new_random_map",
                             0,
                             0,
                             width,
                             0,
-                            g_gr->images().get("images/ui_basic/but1.png"),
+                            UI::ButtonStyle::kWuiSecondary,
                             _("New Random Map")),
-     button_load_map_(&box_,
-                      "load_map",
-                      0,
-                      0,
-                      width,
-                      0,
-                      g_gr->images().get("images/ui_basic/but1.png"),
-                      _("Load Map")),
-     button_save_map_(&box_,
-                      "save_map",
-                      0,
-                      0,
-                      width,
-                      0,
-                      g_gr->images().get("images/ui_basic/but1.png"),
-                      _("Save Map")),
-     button_map_options_(&box_,
-                         "map_options",
-                         0,
-                         0,
-                         width,
-                         0,
-                         g_gr->images().get("images/ui_basic/but1.png"),
-                         _("Map Options")),
-     button_exit_editor_(&box_,
-                         "exit",
-                         0,
-                         0,
-                         width,
-                         0,
-                         g_gr->images().get("images/ui_basic/but5.png"),
-                         _("Exit Editor")) {
+     button_load_map_(
+        &box_, "load_map", 0, 0, width, 0, UI::ButtonStyle::kWuiSecondary, _("Load Map")),
+     button_save_map_(
+        &box_, "save_map", 0, 0, width, 0, UI::ButtonStyle::kWuiSecondary, _("Save Map")),
+     button_map_options_(
+        &box_, "map_options", 0, 0, width, 0, UI::ButtonStyle::kWuiSecondary, _("Map Options")),
+     button_exit_editor_(
+        &box_, "exit", 0, 0, width, 0, UI::ButtonStyle::kWuiPrimary, _("Exit Editor")) {
 	box_.add(&button_new_map_);
 	box_.add(&button_new_random_map_);
 	box_.add(&button_load_map_);

=== modified file 'src/editor/ui_menus/main_menu_load_or_save_map.cc'
--- src/editor/ui_menus/main_menu_load_or_save_map.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/main_menu_load_or_save_map.cc	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 #include "base/wexception.h"
 #include "editor/editorinteractive.h"
 #include "graphic/font_handler1.h"
-#include "graphic/graphic.h"
 #include "io/filesystem/filesystem.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "map_io/widelands_map_loader.h"
@@ -49,13 +48,13 @@
      right_column_x_(tablew_ + 2 * padding_),
      butw_((get_inner_w() - right_column_x_ - 2 * padding_) / 2),
 
-     table_(this, tablex_, tabley_, tablew_, tableh_),
+     table_(this, tablex_, tabley_, tablew_, tableh_, UI::PanelStyle::kWui),
      map_details_(this,
                   right_column_x_,
                   tabley_,
                   get_inner_w() - right_column_x_ - padding_,
                   tableh_,
-                  MapDetails::Style::kWui),
+                  UI::PanelStyle::kWui),
      directory_info_(this, padding_, get_inner_h() - 2 * buth_ - 4 * padding_),
      ok_(this,
          "ok",
@@ -64,7 +63,7 @@
          get_inner_h() - padding_ - buth_,
          butw_,
          buth_,
-         g_gr->images().get("images/ui_basic/but5.png"),
+         UI::ButtonStyle::kWuiPrimary,
          _("OK")),
      cancel_(this,
              "cancel",
@@ -73,7 +72,7 @@
              get_inner_h() - padding_ - buth_,
              butw_,
              buth_,
-             g_gr->images().get("images/ui_basic/but1.png"),
+             UI::ButtonStyle::kWuiSecondary,
              _("Cancel")),
      basedir_(basedir),
      has_translated_mapname_(false),
@@ -82,9 +81,8 @@
 	curdir_ = basedir_;
 
 	UI::Box* vbox = new UI::Box(this, tablex_, padding_, UI::Box::Horizontal, padding_, get_w());
-	show_mapnames_ =
-	   new UI::Button(vbox, "show_mapnames", 0, 0, 2 * butw_, buth_,
-	                  g_gr->images().get("images/ui_basic/but1.png"), _("Show Map Names"));
+	show_mapnames_ = new UI::Button(vbox, "show_mapnames", 0, 0, 2 * butw_, buth_,
+	                                UI::ButtonStyle::kWuiSecondary, _("Show Map Names"));
 	vbox->add(show_mapnames_, UI::Box::Resizing::kFullSize);
 
 	cb_dont_localize_mapnames_ =

=== modified file 'src/editor/ui_menus/main_menu_map_options.cc'
--- src/editor/ui_menus/main_menu_map_options.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/main_menu_map_options.cc	2018-05-12 13:15:45 +0000
@@ -31,7 +31,6 @@
 #include "logic/map.h"
 #include "ui_basic/editbox.h"
 #include "ui_basic/multilineeditbox.h"
-#include "ui_basic/multilinetextarea.h"
 #include "ui_basic/textarea.h"
 #include "wui/map_tags.h"
 
@@ -56,7 +55,7 @@
          get_inner_h() - padding_ - labelh_,
          butw_,
          labelh_,
-         g_gr->images().get("images/ui_basic/but5.png"),
+         UI::ButtonStyle::kWuiPrimary,
          _("OK")),
      cancel_(this,
              "cancel",
@@ -64,26 +63,21 @@
              get_inner_h() - padding_ - labelh_,
              butw_,
              labelh_,
-             g_gr->images().get("images/ui_basic/but1.png"),
+             UI::ButtonStyle::kWuiSecondary,
              _("Cancel")),
      tab_box_(this, padding_, padding_, UI::Box::Vertical, max_w_, get_inner_h(), 0),
-     tabs_(&tab_box_, nullptr),
+     tabs_(&tab_box_, UI::TabPanelStyle::kWuiLight),
 
      main_box_(&tabs_, padding_, padding_, UI::Box::Vertical, max_w_, get_inner_h(), 0),
      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, g_gr->images().get("images/ui_basic/but1.png")),
-     author_(&main_box_, 0, 0, max_w_, 0, 2, g_gr->images().get("images/ui_basic/but1.png")),
+     name_(&main_box_, 0, 0, max_w_, 0, 2, UI::PanelStyle::kWui),
+     author_(&main_box_, 0, 0, max_w_, 0, 2, UI::PanelStyle::kWui),
      size_(&main_box_, 0, 0, max_w_ - indent_, labelh_, ""),
 
-     teams_list_(&teams_box_,
-                 0,
-                 0,
-                 max_w_,
-                 60,
-                 g_gr->images().get("images/ui_basic/but1.png"),
-                 UI::ListselectLayout::kShowCheck),
+     teams_list_(
+        &teams_box_, 0, 0, max_w_, 60, UI::PanelStyle::kWui, UI::ListselectLayout::kShowCheck),
 
      modal_(modal) {
 
@@ -98,13 +92,10 @@
 
 	// We need less space for the hint and the description, but it should at least have 1 line
 	// height.
-	hint_ =
-	   new UI::MultilineEditbox(&main_box_, 0, 0, max_w_, std::max(labelh_, remaining_space * 1 / 3),
-	                            "", g_gr->images().get("images/ui_basic/but1.png"),
-	                            g_gr->images().get("images/ui_basic/but1.png"));
-	descr_ = new UI::MultilineEditbox(&main_box_, 0, 0, max_w_, remaining_space - hint_->get_h(), "",
-	                                  g_gr->images().get("images/ui_basic/but1.png"),
-	                                  g_gr->images().get("images/ui_basic/but1.png"));
+	hint_ = new UI::MultilineEditbox(
+	   &main_box_, 0, 0, max_w_, std::max(labelh_, remaining_space * 1 / 3), UI::PanelStyle::kWui);
+	descr_ = new UI::MultilineEditbox(
+	   &main_box_, 0, 0, max_w_, remaining_space - hint_->get_h(), UI::PanelStyle::kWui);
 
 	main_box_.add(new UI::Textarea(&main_box_, 0, 0, max_w_, labelh_, _("Map name:")));
 	main_box_.add(&name_);

=== modified file 'src/editor/ui_menus/main_menu_new_map.cc'
--- src/editor/ui_menus/main_menu_new_map.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/main_menu_new_map.cc	2018-05-12 13:15:45 +0000
@@ -29,7 +29,6 @@
 #include "base/macros.h"
 #include "editor/editorinteractive.h"
 #include "graphic/font_handler1.h"
-#include "graphic/graphic.h"
 #include "graphic/image.h"
 #include "graphic/texture.h"
 #include "logic/editor_game_base.h"
@@ -55,9 +54,9 @@
             0,
             0,
             0,
+            UI::PanelStyle::kWui,
             _("Width:"),
             UI::SpinBox::Units::kNone,
-            g_gr->images().get("images/ui_basic/but1.png"),
             UI::SpinBox::Type::kValueList),
      height_(&box_,
              0,
@@ -67,11 +66,11 @@
              0,
              0,
              0,
+             UI::PanelStyle::kWui,
              _("Height:"),
              UI::SpinBox::Units::kNone,
-             g_gr->images().get("images/ui_basic/but1.png"),
              UI::SpinBox::Type::kValueList),
-     list_(&box_, 0, 0, box_width_, 330),
+     list_(&box_, 0, 0, box_width_, 330, UI::PanelStyle::kWui),
      // Buttons
      button_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
      ok_button_(&button_box_,
@@ -80,7 +79,7 @@
                 0,
                 box_width_ / 2 - margin_,
                 0,
-                g_gr->images().get("images/ui_basic/but5.png"),
+                UI::ButtonStyle::kWuiPrimary,
                 _("Create Map")),
      cancel_button_(&button_box_,
                     "generate_map",
@@ -88,7 +87,7 @@
                     0,
                     box_width_ / 2 - margin_,
                     0,
-                    g_gr->images().get("images/ui_basic/but1.png"),
+                    UI::ButtonStyle::kWuiSecondary,
                     _("Cancel")) {
 	width_.set_value_list(Widelands::kMapDimensions);
 	height_.set_value_list(Widelands::kMapDimensions);

=== modified file 'src/editor/ui_menus/main_menu_random_map.cc'
--- src/editor/ui_menus/main_menu_random_map.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/main_menu_random_map.cc	2018-05-12 13:15:45 +0000
@@ -32,7 +32,6 @@
 #include "editor/editorinteractive.h"
 #include "editor/map_generator.h"
 #include "graphic/font_handler1.h"
-#include "graphic/graphic.h"
 #include "logic/editor_game_base.h"
 #include "logic/map.h"
 #include "logic/map_objects/world/world.h"
@@ -63,9 +62,9 @@
             0,
             0,
             0,
+            UI::PanelStyle::kWui,
             _("Width:"),
             UI::SpinBox::Units::kNone,
-            g_gr->images().get("images/ui_basic/but1.png"),
             UI::SpinBox::Type::kValueList),
      height_(&box_,
              0,
@@ -75,9 +74,9 @@
              0,
              0,
              0,
+             UI::PanelStyle::kWui,
              _("Height:"),
              UI::SpinBox::Units::kNone,
-             g_gr->images().get("images/ui_basic/but1.png"),
              UI::SpinBox::Type::kValueList),
      max_players_(2),
      players_(&box_,
@@ -88,9 +87,9 @@
               2,
               1,
               max_players_,
+              UI::PanelStyle::kWui,
               _("Players:"),
               UI::SpinBox::Units::kNone,
-              g_gr->images().get("images/ui_basic/but1.png"),
               UI::SpinBox::Type::kSmall),
      // World + Resources
      world_descriptions_({
@@ -123,7 +122,7 @@
             0,
             box_width_ - 2 * margin_ - std::max(world_label_.get_w(), resources_label_.get_w()),
             label_height_,
-            g_gr->images().get("images/ui_basic/but1.png"),
+            UI::ButtonStyle::kWuiSecondary,
             world_descriptions_[current_world_].descname),
      resources_(&resources_box_,
                 "resources",
@@ -131,7 +130,7 @@
                 0,
                 box_width_ - 2 * margin_ - std::max(world_label_.get_w(), resources_label_.get_w()),
                 label_height_,
-                g_gr->images().get("images/ui_basic/but1.png"),
+                UI::ButtonStyle::kWuiSecondary,
                 resource_amounts_[resource_amount_].c_str()),
      // Terrain
      waterval_(20),
@@ -146,9 +145,9 @@
             waterval_,
             0,
             60,
+            UI::PanelStyle::kWui,
             _("Water:"),
             UI::SpinBox::Units::kPercent,
-            g_gr->images().get("images/ui_basic/but1.png"),
             UI::SpinBox::Type::kSmall,
             5),
      land_(&box_,
@@ -159,9 +158,9 @@
            landval_,
            0,
            100,
+           UI::PanelStyle::kWui,
            _("Land:"),
            UI::SpinBox::Units::kPercent,
-           g_gr->images().get("images/ui_basic/but1.png"),
            UI::SpinBox::Type::kSmall,
            5),
      wasteland_(&box_,
@@ -172,9 +171,9 @@
                 wastelandval_,
                 0,
                 70,
+                UI::PanelStyle::kWui,
                 _("Wasteland:"),
                 UI::SpinBox::Units::kPercent,
-                g_gr->images().get("images/ui_basic/but1.png"),
                 UI::SpinBox::Type::kSmall,
                 5),
      mountains_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
@@ -196,7 +195,7 @@
                       box_width_ - 2 * margin_ - map_number_label_.get_w(),
                       0,
                       2,
-                      g_gr->images().get("images/ui_basic/but1.png")),
+                      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_edit_(&map_id_box_,
@@ -205,7 +204,7 @@
                   box_width_ - 2 * margin_ - map_id_label_.get_w(),
                   0,
                   2,
-                  g_gr->images().get("images/ui_basic/but1.png")),
+                  UI::PanelStyle::kWui),
      // Buttons
      button_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
      ok_button_(&button_box_,
@@ -214,7 +213,7 @@
                 0,
                 box_width_ / 2 - margin_,
                 0,
-                g_gr->images().get("images/ui_basic/but5.png"),
+                UI::ButtonStyle::kWuiPrimary,
                 _("Generate Map")),
      cancel_button_(&button_box_,
                     "generate_map",
@@ -222,7 +221,7 @@
                     0,
                     box_width_ / 2 - margin_,
                     0,
-                    g_gr->images().get("images/ui_basic/but1.png"),
+                    UI::ButtonStyle::kWuiSecondary,
                     _("Cancel")) {
 	int32_t box_height = 0;
 

=== modified file 'src/editor/ui_menus/main_menu_save_map.cc'
--- src/editor/ui_menus/main_menu_save_map.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/main_menu_save_map.cc	2018-05-12 13:15:45 +0000
@@ -33,7 +33,6 @@
 #include "editor/editorinteractive.h"
 #include "editor/ui_menus/main_menu_map_options.h"
 #include "editor/ui_menus/main_menu_save_map_make_directory.h"
-#include "graphic/graphic.h"
 #include "io/filesystem/filesystem.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "io/filesystem/zip_filesystem.h"
@@ -58,7 +57,7 @@
                      tabley_ + tableh_ + 3 * padding_ - 1,
                      get_inner_w() - right_column_x_ - padding_,
                      buth_,
-                     g_gr->images().get("images/ui_basic/but1.png"),
+                     UI::ButtonStyle::kWuiSecondary,
                      _("Make Directory")),
      edit_options_(this,
                    "edit_options",
@@ -66,7 +65,7 @@
                    tabley_ + tableh_ - buth_,
                    get_inner_w() - right_column_x_ - padding_,
                    buth_,
-                   g_gr->images().get("images/ui_basic/but5.png"),
+                   UI::ButtonStyle::kWuiPrimary,
                    _("Map Options")),
      editbox_label_(
         this, padding_, tabley_ + tableh_ + 3 * padding_, butw_, buth_, _("Filename:")) {
@@ -79,10 +78,9 @@
 	table_.double_clicked.connect(
 	   boost::bind(&MainMenuSaveMap::double_clicked_item, boost::ref(*this)));
 
-	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, g_gr->images().get("images/ui_basic/but1.png"));
+	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);
 
 	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	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/main_menu_save_map_make_directory.cc	2018-05-12 13:15:45 +0000
@@ -21,7 +21,6 @@
 
 #include "base/i18n.h"
 #include "graphic/font_handler1.h"
-#include "graphic/graphic.h"
 #include "io/filesystem/layered_filesystem.h"
 
 MainMenuSaveMapMakeDirectory::MainMenuSaveMapMakeDirectory(UI::Panel* const parent,
@@ -39,20 +38,14 @@
            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,
-           g_gr->images().get("images/ui_basic/but1.png")),
+     edit_(&vbox_, 0, 0, get_inner_w() - 2 * padding_, 0, 4, UI::PanelStyle::kWui),
      ok_button_(this,
                 "ok",
                 UI::g_fh1->fontset()->is_rtl() ? padding_ : get_inner_w() - butw_ - padding_,
                 get_inner_h() - padding_ - buth_,
                 butw_,
                 buth_,
-                g_gr->images().get("images/ui_basic/but5.png"),
+                UI::ButtonStyle::kWuiPrimary,
                 _("OK")),
      cancel_button_(this,
                     "cancel",
@@ -60,7 +53,7 @@
                     get_inner_h() - padding_ - buth_,
                     butw_,
                     buth_,
-                    g_gr->images().get("images/ui_basic/but1.png"),
+                    UI::ButtonStyle::kWuiSecondary,
                     _("Cancel")) {
 
 	vbox_.add(&label_);

=== modified file 'src/editor/ui_menus/player_menu.cc'
--- src/editor/ui_menus/player_menu.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/player_menu.cc	2018-05-12 13:15:45 +0000
@@ -47,7 +47,7 @@
                  5,
                  20,
                  20,
-                 g_gr->images().get("images/ui_basic/but1.png"),
+                 UI::ButtonStyle::kWuiSecondary,
                  g_gr->images().get("images/ui_basic/scrollbar_up.png"),
                  _("Add player")),
      remove_last_player_(this,
@@ -56,7 +56,7 @@
                          5,
                          20,
                          20,
-                         g_gr->images().get("images/ui_basic/but1.png"),
+                         UI::ButtonStyle::kWuiSecondary,
                          g_gr->images().get("images/ui_basic/scrollbar_down.png"),
                          _("Remove last player")),
      tribenames_(Widelands::get_all_tribenames()) {
@@ -140,8 +140,7 @@
 	iterate_player_numbers(p, nr_players) {
 		int32_t posx = spacing;
 		if (!plr_names_[p - 1]) {
-			plr_names_[p - 1] = new UI::EditBox(
-			   this, posx, posy, 140, size, 2, g_gr->images().get("images/ui_basic/but0.png"));
+			plr_names_[p - 1] = new UI::EditBox(this, posx, posy, 140, size, 2, UI::PanelStyle::kWui);
 			plr_names_[p - 1]->changed.connect(
 			   boost::bind(&EditorPlayerMenu::name_changed, this, p - 1));
 			posx += 140 + spacing;
@@ -149,9 +148,8 @@
 		}
 
 		if (!plr_set_tribes_buts_[p - 1]) {
-			plr_set_tribes_buts_[p - 1] =
-			   new UI::Button(this, "tribe", posx, posy, 140, size,
-			                  g_gr->images().get("images/ui_basic/but0.png"), "");
+			plr_set_tribes_buts_[p - 1] = new UI::Button(
+			   this, "tribe", posx, posy, 140, size, UI::ButtonStyle::kWuiSecondary, "");
 			plr_set_tribes_buts_[p - 1]->sigclicked.connect(
 			   boost::bind(&EditorPlayerMenu::player_tribe_clicked, boost::ref(*this), p - 1));
 			posx += 140 + spacing;
@@ -174,9 +172,8 @@
 
 		//  Set Starting pos button.
 		if (!plr_set_pos_buts_[p - 1]) {
-			plr_set_pos_buts_[p - 1] =
-			   new UI::Button(this, "starting_pos", posx, posy, size, size,
-			                  g_gr->images().get("images/ui_basic/but0.png"), nullptr, "");
+			plr_set_pos_buts_[p - 1] = new UI::Button(this, "starting_pos", posx, posy, size, size,
+			                                          UI::ButtonStyle::kWuiSecondary, nullptr, "");
 			plr_set_pos_buts_[p - 1]->sigclicked.connect(
 			   boost::bind(&EditorPlayerMenu::set_starting_pos_clicked, boost::ref(*this), p));
 		}

=== modified file 'src/editor/ui_menus/tool_change_height_options_menu.cc'
--- src/editor/ui_menus/tool_change_height_options_menu.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/tool_change_height_options_menu.cc	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 #include "editor/editorinteractive.h"
 #include "editor/tools/increase_height_tool.h"
 #include "editor/tools/set_height_tool.h"
-#include "graphic/graphic.h"
 #include "logic/widelands_geometry.h"
 
 EditorToolChangeHeightOptionsMenu::EditorToolChangeHeightOptionsMenu(
@@ -44,9 +43,9 @@
                 increase_tool_.get_change_by(),
                 1,
                 MAX_FIELD_HEIGHT_DIFF,
+                UI::PanelStyle::kWui,
                 _("Increase/Decrease height by:"),
                 UI::SpinBox::Units::kNone,
-                g_gr->images().get("images/ui_basic/but1.png"),
                 UI::SpinBox::Type::kSmall),
      set_to_(&box_,
              0,
@@ -56,9 +55,9 @@
              increase_tool_.set_tool().get_interval().min,
              0,
              MAX_FIELD_HEIGHT,
+             UI::PanelStyle::kWui,
              _("Set height to:"),
              UI::SpinBox::Units::kNone,
-             g_gr->images().get("images/ui_basic/but1.png"),
              UI::SpinBox::Type::kSmall) {
 	change_by_.set_tooltip(
 	   /** TRANSLATORS: Editor change height access keys. **/

=== modified file 'src/editor/ui_menus/tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/tool_change_resources_options_menu.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/tool_change_resources_options_menu.cc	2018-05-12 13:15:45 +0000
@@ -57,9 +57,9 @@
                 increase_tool_.get_change_by(),
                 1,
                 kMaxValue,
+                UI::PanelStyle::kWui,
                 _("Increase/Decrease amount by:"),
                 UI::SpinBox::Units::kNone,
-                g_gr->images().get("images/ui_basic/but1.png"),
                 UI::SpinBox::Type::kSmall),
      set_to_(&box_,
              0,
@@ -69,9 +69,9 @@
              increase_tool_.set_tool().get_set_to(),
              0,
              kMaxValue,
+             UI::PanelStyle::kWui,
              _("Set amount to:"),
              UI::SpinBox::Units::kNone,
-             g_gr->images().get("images/ui_basic/but1.png"),
              UI::SpinBox::Type::kSmall),
      resources_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, 1),
      cur_selection_(&box_, 0, 0, "", UI::Align::kCenter) {

=== modified file 'src/editor/ui_menus/tool_noise_height_options_menu.cc'
--- src/editor/ui_menus/tool_noise_height_options_menu.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/tool_noise_height_options_menu.cc	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 #include "editor/tools/decrease_height_tool.h"
 #include "editor/tools/increase_height_tool.h"
 #include "editor/tools/noise_height_tool.h"
-#include "graphic/graphic.h"
 #include "logic/widelands_geometry.h"
 #include "ui_basic/textarea.h"
 
@@ -47,9 +46,9 @@
             noise_tool_.get_interval().min,
             1,
             MAX_FIELD_HEIGHT,
+            UI::PanelStyle::kWui,
             _("Minimum height:"),
             UI::SpinBox::Units::kNone,
-            g_gr->images().get("images/ui_basic/but1.png"),
             UI::SpinBox::Type::kSmall),
      upper_(&box_,
             0,
@@ -59,9 +58,9 @@
             noise_tool_.get_interval().max,
             0,
             MAX_FIELD_HEIGHT,
+            UI::PanelStyle::kWui,
             _("Maximum height:"),
             UI::SpinBox::Units::kNone,
-            g_gr->images().get("images/ui_basic/but1.png"),
             UI::SpinBox::Type::kSmall),
      set_to_(&box_,
              0,
@@ -71,9 +70,9 @@
              noise_tool_.set_tool().get_interval().min,
              0,
              MAX_FIELD_HEIGHT,
+             UI::PanelStyle::kWui,
              _("Set height to:"),
              UI::SpinBox::Units::kNone,
-             g_gr->images().get("images/ui_basic/but1.png"),
              UI::SpinBox::Type::kSmall) {
 	lower_.set_tooltip(
 	   /** TRANSLATORS: Editor random height access key. **/

=== modified file 'src/editor/ui_menus/tool_place_critter_options_menu.cc'
--- src/editor/ui_menus/tool_place_critter_options_menu.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/tool_place_critter_options_menu.cc	2018-05-12 13:15:45 +0000
@@ -24,7 +24,6 @@
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
 #include "editor/tools/place_critter_tool.h"
-#include "graphic/graphic.h"
 #include "logic/map.h"
 #include "logic/map_objects/world/critter.h"
 #include "logic/map_objects/world/world.h"

=== modified file 'src/editor/ui_menus/tool_place_immovable_options_menu.cc'
--- src/editor/ui_menus/tool_place_immovable_options_menu.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/tool_place_immovable_options_menu.cc	2018-05-12 13:15:45 +0000
@@ -24,7 +24,6 @@
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
 #include "editor/tools/place_immovable_tool.h"
-#include "graphic/graphic.h"
 #include "logic/map.h"
 #include "logic/map_objects/world/world.h"
 #include "ui_basic/box.h"

=== modified file 'src/editor/ui_menus/tool_set_terrain_options_menu.cc'
--- src/editor/ui_menus/tool_set_terrain_options_menu.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/tool_set_terrain_options_menu.cc	2018-05-12 13:15:45 +0000
@@ -27,7 +27,6 @@
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
 #include "editor/tools/set_terrain_tool.h"
-#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "graphic/texture.h"
 #include "logic/map.h"
@@ -36,7 +35,6 @@
 #include "logic/map_objects/world/world.h"
 #include "ui_basic/checkbox.h"
 #include "ui_basic/panel.h"
-#include "ui_basic/tabpanel.h"
 
 namespace {
 

=== modified file 'src/editor/ui_menus/toolsize_menu.cc'
--- src/editor/ui_menus/toolsize_menu.cc	2018-04-07 16:59:00 +0000
+++ src/editor/ui_menus/toolsize_menu.cc	2018-05-12 13:15:45 +0000
@@ -45,7 +45,7 @@
                25,
                20,
                20,
-               g_gr->images().get("images/ui_basic/but0.png"),
+               UI::ButtonStyle::kWuiSecondary,
                g_gr->images().get("images/ui_basic/scrollbar_up.png")),
      decrease_(this,
                "decr",
@@ -53,7 +53,7 @@
                25,
                20,
                20,
-               g_gr->images().get("images/ui_basic/but0.png"),
+               UI::ButtonStyle::kWuiSecondary,
                g_gr->images().get("images/ui_basic/scrollbar_down.png")),
      value_(0) {
 	increase_.sigclicked.connect(

=== modified file 'src/game_io/CMakeLists.txt'
--- src/game_io/CMakeLists.txt	2017-11-20 13:50:51 +0000
+++ src/game_io/CMakeLists.txt	2018-05-12 13:15:45 +0000
@@ -29,7 +29,6 @@
     base_time_string
     build_info
     economy
-    graphic
     graphic_image_io
     graphic_minimap_renderer
     io_fileread

=== modified file 'src/game_io/game_preload_packet.cc'
--- src/game_io/game_preload_packet.cc	2018-04-07 16:59:00 +0000
+++ src/game_io/game_preload_packet.cc	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 
 #include "base/time_string.h"
 #include "build_info.h"
-#include "graphic/graphic.h"
 #include "graphic/image_io.h"
 #include "graphic/minimap_renderer.h"
 #include "logic/game.h"

=== modified file 'src/graphic/CMakeLists.txt'
--- src/graphic/CMakeLists.txt	2017-09-01 15:45:59 +0000
+++ src/graphic/CMakeLists.txt	2018-05-12 13:15:45 +0000
@@ -5,6 +5,16 @@
 
 # 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
@@ -115,7 +125,6 @@
     base_geometry
     base_log
     base_macros
-    graphic
     graphic_color
     graphic_draw_programs
     graphic_gl_utils
@@ -195,7 +204,6 @@
     base_geometry
     base_macros
     economy
-    graphic
     graphic_surface
     logic
     wui_mapview_pixelfunctions
@@ -228,7 +236,6 @@
     base_geometry
     base_log
     base_macros
-    graphic
     graphic_fields_to_draw
     graphic_gl_utils
     graphic_image_io
@@ -330,6 +337,8 @@
     diranimations.h
     graphic.cc
     graphic.h
+    style_manager.cc
+    style_manager.h
     rendertarget.cc
     rendertarget.h
   USES_SDL2
@@ -339,6 +348,7 @@
     base_i18n
     base_log
     base_macros
+    base_scoped_timer
     build_info
     graphic_align
     graphic_build_texture_atlas
@@ -349,6 +359,7 @@
     graphic_image_io
     graphic_playercolor
     graphic_render_queue
+    graphic_styles
     graphic_surface
     graphic_text_layout
     io_filesystem
@@ -356,6 +367,7 @@
     logic_constants
     note_sound
     notifications
+    scripting_lua_interface
     scripting_lua_table
     sound
 )

=== modified file 'src/graphic/game_renderer.cc'
--- src/graphic/game_renderer.cc	2018-04-07 16:59:00 +0000
+++ src/graphic/game_renderer.cc	2018-05-12 13:15:45 +0000
@@ -22,7 +22,6 @@
 #include <memory>
 
 #include "graphic/gl/coordinate_conversion.h"
-#include "graphic/graphic.h"
 #include "graphic/render_queue.h"
 #include "graphic/rendertarget.h"
 #include "graphic/surface.h"

=== modified file 'src/graphic/gl/road_program.cc'
--- src/graphic/gl/road_program.cc	2018-04-07 16:59:00 +0000
+++ src/graphic/gl/road_program.cc	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 #include "graphic/gl/coordinate_conversion.h"
 #include "graphic/gl/fields_to_draw.h"
 #include "graphic/gl/utils.h"
-#include "graphic/graphic.h"
 #include "graphic/image_io.h"
 #include "graphic/texture.h"
 #include "logic/player.h"

=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc	2018-04-07 16:59:00 +0000
+++ src/graphic/graphic.cc	2018-05-12 13:15:45 +0000
@@ -59,7 +59,10 @@
 
 }  // namespace
 
-Graphic::Graphic() : image_cache_(new ImageCache()), animation_manager_(new AnimationManager()) {
+Graphic::Graphic()
+   : image_cache_(new ImageCache()),
+     animation_manager_(new AnimationManager()),
+     style_manager_(new StyleManager()) {
 }
 
 /**
@@ -112,6 +115,7 @@
 	auto texture_atlases = build_texture_atlas(max_texture_size_, &textures_in_atlas);
 	image_cache_->fill_with_texture_atlases(
 	   std::move(texture_atlases), std::move(textures_in_atlas));
+	styles().init();
 }
 
 Graphic::~Graphic() {

=== modified file 'src/graphic/graphic.h'
--- src/graphic/graphic.h	2018-04-07 16:59:00 +0000
+++ src/graphic/graphic.h	2018-05-12 13:15:45 +0000
@@ -25,6 +25,7 @@
 #include <SDL.h>
 
 #include "graphic/image_cache.h"
+#include "graphic/style_manager.h"
 #include "notifications/note_ids.h"
 #include "notifications/notifications.h"
 
@@ -90,6 +91,9 @@
 	AnimationManager& animations() const {
 		return *animation_manager_.get();
 	}
+	StyleManager& styles() const {
+		return *style_manager_.get();
+	}
 
 	// Requests a screenshot being taken on the next frame.
 	void screenshot(const std::string& fname);
@@ -124,6 +128,9 @@
 	/// This holds all animations.
 	std::unique_ptr<AnimationManager> animation_manager_;
 
+	/// This holds all GUI styles.
+	std::unique_ptr<StyleManager> style_manager_;
+
 	/// Screenshot filename. If a screenshot is requested, this will be set to
 	/// the requested filename. On the next frame the screenshot will be written
 	/// out and this will be clear()ed again.

=== modified file 'src/graphic/minimap_renderer.cc'
--- src/graphic/minimap_renderer.cc	2018-04-07 16:59:00 +0000
+++ src/graphic/minimap_renderer.cc	2018-05-12 13:15:45 +0000
@@ -24,7 +24,6 @@
 #include "base/macros.h"
 #include "economy/flag.h"
 #include "economy/road.h"
-#include "graphic/graphic.h"
 #include "logic/field.h"
 #include "logic/map_objects/world/terrain_description.h"
 #include "logic/map_objects/world/world.h"

=== added file 'src/graphic/panel_styles.cc'
--- src/graphic/panel_styles.cc	1970-01-01 00:00:00 +0000
+++ src/graphic/panel_styles.cc	2018-05-12 13:15:45 +0000
@@ -0,0 +1,1 @@
+// Dummy to make CMake happy

=== added file 'src/graphic/panel_styles.h'
--- src/graphic/panel_styles.h	1970-01-01 00:00:00 +0000
+++ src/graphic/panel_styles.h	2018-05-12 13:15:45 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 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_PANEL_STYLES_H
+#define WL_GRAPHIC_PANEL_STYLES_H
+
+#include "graphic/color.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;
+};
+
+}  // namespace UI
+
+#endif  // end of include guard: WL_GRAPHIC_PANEL_STYLES_H

=== added file 'src/graphic/style_manager.cc'
--- src/graphic/style_manager.cc	1970-01-01 00:00:00 +0000
+++ src/graphic/style_manager.cc	2018-05-12 13:15:45 +0000
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2017 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include "graphic/style_manager.h"
+
+#include <memory>
+
+#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) {
+	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));
+}
+
+// Stupid completeness check - enum classes weren't meant for iterating, so we just compare the size
+// to the last enum member. This assumes that there are no holes in the enum, and will need
+// adjusting if the last enum member changes.
+void check_completeness(const std::string& name, size_t map_size, size_t last_enum_member) {
+	if (map_size != last_enum_member + 1) {
+		throw wexception("StyleManager: There is a definition missing for the '%s'.", name.c_str());
+	}
+}
+}  // namespace
+
+void StyleManager::init() {
+
+	ScopedTimer timer("Style Manager: Reading style templates took %ums");
+
+	buttonstyles_.clear();
+	sliderstyles_.clear();
+	tabpanelstyles_.clear();
+	editboxstyles_.clear();
+	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());
+	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::kWuiBuildingStats, *style_table->get_table("building_stats").get());
+	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());
+	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());
+	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");
+	add_tabpanel_style(UI::TabPanelStyle::kFsMenu, *style_table->get_table("menu").get());
+	style_table = element_table->get_table("wui");
+	add_tabpanel_style(UI::TabPanelStyle::kWuiLight, *style_table->get_table("light").get());
+	add_tabpanel_style(UI::TabPanelStyle::kWuiDark, *style_table->get_table("dark").get());
+	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_);
+	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");
+	add_style(UI::PanelStyle::kFsMenu, *style_table->get_table("menu").get(), &dropdownstyles_);
+	style_table = element_table->get_table("wui");
+	add_style(UI::PanelStyle::kWui, *style_table->get_table("menu").get(), &dropdownstyles_);
+	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");
+	add_style(UI::PanelStyle::kFsMenu, *style_table->get_table("menu").get(), &scrollbarstyles_);
+	style_table = element_table->get_table("wui");
+	add_style(UI::PanelStyle::kWui, *style_table->get_table("menu").get(), &scrollbarstyles_);
+	check_completeness(
+	   "scrollbars", scrollbarstyles_.size(), static_cast<size_t>(UI::PanelStyle::kWui));
+
+	log("took %ums\n", timer.ms_since_last_query());
+}
+
+// Return functions for the styles
+const UI::PanelStyleInfo* StyleManager::button_style(UI::ButtonStyle style) const {
+	assert(buttonstyles_.count(style) == 1);
+	return buttonstyles_.at(style).get();
+}
+
+const UI::PanelStyleInfo* StyleManager::slider_style(UI::SliderStyle style) const {
+	assert(sliderstyles_.count(style) == 1);
+	return sliderstyles_.at(style).get();
+}
+
+const UI::PanelStyleInfo* StyleManager::tabpanel_style(UI::TabPanelStyle style) const {
+	assert(tabpanelstyles_.count(style) == 1);
+	return tabpanelstyles_.at(style).get();
+}
+
+const UI::PanelStyleInfo* StyleManager::editbox_style(UI::PanelStyle style) const {
+	assert(editboxstyles_.count(style) == 1);
+	return editboxstyles_.at(style).get();
+}
+
+const UI::PanelStyleInfo* StyleManager::dropdown_style(UI::PanelStyle style) const {
+	assert(dropdownstyles_.count(style) == 1);
+	return dropdownstyles_.at(style).get();
+}
+
+const UI::PanelStyleInfo* StyleManager::scrollbar_style(UI::PanelStyle style) const {
+	assert(scrollbarstyles_.count(style) == 1);
+	return scrollbarstyles_.at(style).get();
+}
+
+// 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))));
+}
+
+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))));
+}
+
+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))));
+}
+
+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))));
+}

=== added file 'src/graphic/style_manager.h'
--- src/graphic/style_manager.h	1970-01-01 00:00:00 +0000
+++ src/graphic/style_manager.h	2018-05-12 13:15:45 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2017 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef WL_GRAPHIC_STYLE_MANAGER_H
+#define WL_GRAPHIC_STYLE_MANAGER_H
+
+#include <map>
+#include <memory>
+
+#include "graphic/panel_styles.h"
+#include "scripting/lua_table.h"
+
+static const std::string kTemplateDir = "templates/default/";
+
+class StyleManager {
+public:
+	StyleManager() = default;
+	~StyleManager() = default;
+
+	// 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::PanelStyleInfo* tabpanel_style(UI::TabPanelStyle) const;
+	const UI::PanelStyleInfo* editbox_style(UI::PanelStyle) const;
+	const UI::PanelStyleInfo* dropdown_style(UI::PanelStyle) const;
+	const UI::PanelStyleInfo* scrollbar_style(UI::PanelStyle) const;
+
+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_tabpanel_style(UI::TabPanelStyle style, const LuaTable& table);
+	void add_style(UI::PanelStyle style, const LuaTable& table, PanelStyleMap* map);
+
+	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::TabPanelStyle, std::unique_ptr<const UI::PanelStyleInfo>> tabpanelstyles_;
+	PanelStyleMap editboxstyles_;
+	PanelStyleMap dropdownstyles_;
+	PanelStyleMap scrollbarstyles_;
+
+	DISALLOW_COPY_AND_ASSIGN(StyleManager);
+};
+
+#endif  // end of include guard: WL_GRAPHIC_STYLE_MANAGER_H

=== modified file 'src/graphic/texture.cc'
--- src/graphic/texture.cc	2017-05-21 14:52:14 +0000
+++ src/graphic/texture.cc	2018-05-12 13:15:45 +0000
@@ -30,7 +30,6 @@
 #include "graphic/gl/draw_line_program.h"
 #include "graphic/gl/fill_rect_program.h"
 #include "graphic/gl/utils.h"
-#include "graphic/graphic.h"
 #include "graphic/sdl_utils.h"
 #include "graphic/surface.h"
 

=== modified file 'src/io/filesystem/filesystem.cc'
--- src/io/filesystem/filesystem.cc	2018-04-07 16:59:00 +0000
+++ src/io/filesystem/filesystem.cc	2018-05-12 13:15:45 +0000
@@ -93,7 +93,7 @@
 /**
  * Fix a path that might come from another OS.
  * This function is used to make sure that paths send via network are usable
- * on locale OS.
+ * on local OS.
  */
 std::string FileSystem::fix_cross_file(const std::string& path) const {
 	uint32_t path_size = path.size();

=== modified file 'src/logic/CMakeLists.txt'
--- src/logic/CMakeLists.txt	2017-12-19 07:12:18 +0000
+++ src/logic/CMakeLists.txt	2018-05-12 13:15:45 +0000
@@ -265,7 +265,6 @@
     base_time_string
     build_info
     economy
-    editor
     game_io
     graphic
     graphic_color

=== modified file 'src/logic/editor_game_base.cc'
--- src/logic/editor_game_base.cc	2018-04-07 16:59:00 +0000
+++ src/logic/editor_game_base.cc	2018-05-12 13:15:45 +0000
@@ -30,7 +30,6 @@
 #include "economy/flag.h"
 #include "economy/road.h"
 #include "graphic/color.h"
-#include "graphic/graphic.h"
 #include "logic/findimmovable.h"
 #include "logic/game.h"
 #include "logic/game_data_error.h"

=== modified file 'src/logic/game.cc'
--- src/logic/game.cc	2018-04-27 20:12:08 +0000
+++ src/logic/game.cc	2018-05-12 13:15:45 +0000
@@ -40,7 +40,6 @@
 #include "economy/economy.h"
 #include "game_io/game_loader.h"
 #include "game_io/game_preload_packet.h"
-#include "graphic/graphic.h"
 #include "io/fileread.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "io/filewrite.h"

=== modified file 'src/logic/map.cc'
--- src/logic/map.cc	2018-04-11 18:42:55 +0000
+++ src/logic/map.cc	2018-05-12 13:15:45 +0000
@@ -32,7 +32,6 @@
 #include "build_info.h"
 #include "economy/flag.h"
 #include "economy/road.h"
-#include "editor/tools/increase_resources_tool.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "logic/filesystem_constants.h"
 #include "logic/findimmovable.h"

=== modified file 'src/logic/map_objects/bob.cc'
--- src/logic/map_objects/bob.cc	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/bob.cc	2018-05-12 13:15:45 +0000
@@ -29,7 +29,6 @@
 #include "base/wexception.h"
 #include "economy/route.h"
 #include "economy/transfer.h"
-#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"

=== modified file 'src/logic/map_objects/map_object.h'
--- src/logic/map_objects/map_object.h	2018-05-07 19:11:53 +0000
+++ src/logic/map_objects/map_object.h	2018-05-12 13:15:45 +0000
@@ -39,13 +39,11 @@
 #include "logic/map_objects/tribes/training_attribute.h"
 #include "logic/widelands.h"
 #include "scripting/lua_table.h"
+#include "ui_basic/tabpanel.h"
 
 class FileRead;
 class RenderTarget;
 struct DirAnimations;
-namespace UI {
-struct TabPanel;
-}
 
 namespace Widelands {
 

=== modified file 'src/logic/map_objects/tribes/building.cc'
--- src/logic/map_objects/tribes/building.cc	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/tribes/building.cc	2018-05-12 13:15:45 +0000
@@ -32,7 +32,6 @@
 #include "economy/flag.h"
 #include "economy/input_queue.h"
 #include "economy/request.h"
-#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "graphic/text_constants.h"
 #include "io/filesystem/filesystem.h"

=== modified file 'src/logic/map_objects/tribes/dismantlesite.cc'
--- src/logic/map_objects/tribes/dismantlesite.cc	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/tribes/dismantlesite.cc	2018-05-12 13:15:45 +0000
@@ -28,7 +28,6 @@
 #include "base/wexception.h"
 #include "economy/wares_queue.h"
 #include "graphic/animation.h"
-#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "graphic/text_constants.h"
 #include "logic/editor_game_base.h"

=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/tribes/production_program.cc	2018-05-12 13:15:45 +0000
@@ -32,7 +32,6 @@
 #include "economy/economy.h"
 #include "economy/flag.h"
 #include "economy/input_queue.h"
-#include "graphic/graphic.h"
 #include "helper.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "logic/findimmovable.h"

=== modified file 'src/logic/map_objects/tribes/ship.cc'
--- src/logic/map_objects/tribes/ship.cc	2018-04-29 09:20:29 +0000
+++ src/logic/map_objects/tribes/ship.cc	2018-05-12 13:15:45 +0000
@@ -30,7 +30,6 @@
 #include "economy/fleet.h"
 #include "economy/portdock.h"
 #include "economy/wares_queue.h"
-#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "graphic/text_constants.h"
 #include "io/fileread.h"

=== modified file 'src/logic/map_objects/tribes/ware_descr.cc'
--- src/logic/map_objects/tribes/ware_descr.cc	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/tribes/ware_descr.cc	2018-05-12 13:15:45 +0000
@@ -25,7 +25,6 @@
 
 #include "base/i18n.h"
 #include "graphic/animation.h"
-#include "graphic/graphic.h"
 #include "logic/game_data_error.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
 

=== modified file 'src/logic/map_objects/tribes/worker_descr.cc'
--- src/logic/map_objects/tribes/worker_descr.cc	2018-05-05 13:51:33 +0000
+++ src/logic/map_objects/tribes/worker_descr.cc	2018-05-12 13:15:45 +0000
@@ -24,7 +24,6 @@
 #include "base/i18n.h"
 #include "base/vector.h"
 #include "base/wexception.h"
-#include "graphic/graphic.h"
 #include "logic/game_data_error.h"
 #include "logic/map_objects/tribes/carrier.h"
 #include "logic/map_objects/tribes/soldier.h"

=== modified file 'src/logic/map_objects/tribes/worker_program.cc'
--- src/logic/map_objects/tribes/worker_program.cc	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/tribes/worker_program.cc	2018-05-12 13:15:45 +0000
@@ -23,7 +23,6 @@
 #include <string>
 
 #include "base/log.h"
-#include "graphic/graphic.h"
 #include "helper.h"
 #include "logic/findnode.h"
 #include "logic/game_data_error.h"

=== modified file 'src/logic/map_objects/world/critter.cc'
--- src/logic/map_objects/world/critter.cc	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/world/critter.cc	2018-05-12 13:15:45 +0000
@@ -27,7 +27,6 @@
 #include <stdint.h>
 
 #include "base/wexception.h"
-#include "graphic/graphic.h"
 #include "helper.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"

=== modified file 'src/logic/map_objects/world/terrain_description.h'
--- src/logic/map_objects/world/terrain_description.h	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/world/terrain_description.h	2018-05-12 13:15:45 +0000
@@ -26,7 +26,7 @@
 
 #include "base/macros.h"
 #include "graphic/color.h"
-#include "graphic/graphic.h"
+#include "graphic/image.h"
 #include "logic/map_objects/world/resource_description.h"
 #include "logic/widelands.h"
 

=== modified file 'src/logic/map_objects/world/world.cc'
--- src/logic/map_objects/world/world.cc	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/world/world.cc	2018-05-12 13:15:45 +0000
@@ -22,6 +22,7 @@
 #include <memory>
 
 #include "base/i18n.h"
+#include "graphic/graphic.h"
 #include "graphic/image_io.h"
 #include "logic/game_data_error.h"
 #include "logic/map_objects/immovable.h"

=== modified file 'src/map_io/map_building_packet.cc'
--- src/map_io/map_building_packet.cc	2018-04-07 16:59:00 +0000
+++ src/map_io/map_building_packet.cc	2018-05-12 13:15:45 +0000
@@ -23,7 +23,6 @@
 
 #include "base/macros.h"
 #include "economy/request.h"
-#include "graphic/graphic.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
 #include "logic/editor_game_base.h"

=== modified file 'src/scripting/CMakeLists.txt'
--- src/scripting/CMakeLists.txt	2017-11-20 13:50:51 +0000
+++ src/scripting/CMakeLists.txt	2018-05-12 13:15:45 +0000
@@ -104,7 +104,6 @@
     base_log
     base_macros
     economy
-    graphic
     io_fileread
     io_filesystem
     logic

=== modified file 'src/scripting/lua_interface.cc'
--- src/scripting/lua_interface.cc	2018-04-07 16:59:00 +0000
+++ src/scripting/lua_interface.cc	2018-05-12 13:15:45 +0000
@@ -93,5 +93,5 @@
 }
 
 std::unique_ptr<LuaTable> LuaInterface::run_script(const std::string& path) {
-	return ::run_script(lua_state_, path, g_fs);
+	return ::run_script(lua_state_, g_fs->fix_cross_file(path), g_fs);
 }

=== modified file 'src/scripting/lua_map.cc'
--- src/scripting/lua_map.cc	2018-04-11 18:42:55 +0000
+++ src/scripting/lua_map.cc	2018-05-12 13:15:45 +0000
@@ -27,7 +27,6 @@
 #include "base/macros.h"
 #include "base/wexception.h"
 #include "economy/input_queue.h"
-#include "graphic/graphic.h"
 #include "logic/findimmovable.h"
 #include "logic/map_objects/checkstep.h"
 #include "logic/map_objects/immovable.h"

=== modified file 'src/sound/CMakeLists.txt'
--- src/sound/CMakeLists.txt	2017-03-04 11:40:59 +0000
+++ src/sound/CMakeLists.txt	2018-05-12 13:15:45 +0000
@@ -22,7 +22,6 @@
   DEPENDS
     base_i18n
     base_log
-    graphic
     helper
     io_fileread
     io_filesystem

=== modified file 'src/sound/sound_handler.cc'
--- src/sound/sound_handler.cc	2018-04-23 08:25:10 +0000
+++ src/sound/sound_handler.cc	2018-05-12 13:15:45 +0000
@@ -32,7 +32,6 @@
 
 #include "base/i18n.h"
 #include "base/log.h"
-#include "graphic/graphic.h"
 #include "helper.h"
 #include "io/fileread.h"
 #include "io/filesystem/layered_filesystem.h"

=== modified file 'src/ui_basic/CMakeLists.txt'
--- src/ui_basic/CMakeLists.txt	2017-02-28 20:07:07 +0000
+++ src/ui_basic/CMakeLists.txt	2018-05-12 13:15:45 +0000
@@ -65,6 +65,7 @@
     graphic_color
     graphic_fonthandler
     graphic_fonthandler_legacy
+    graphic_styles
     graphic_surface
     graphic_text
     graphic_text_constants

=== modified file 'src/ui_basic/box.cc'
--- src/ui_basic/box.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/box.cc	2018-05-12 13:15:45 +0000
@@ -195,9 +195,9 @@
 			pagesize = get_inner_h() - Scrollbar::kSize;
 		}
 		if (scrollbar_ == nullptr) {
-			scrollbar_.reset(new Scrollbar(this, sb_x, sb_y, sb_w, sb_h,
-			                               g_gr->images().get("images/ui_basic/but3.png"),
-			                               orientation_ == Horizontal));
+			// TODO(GunChleoc): Implement styling if we ever use the scrollbar function.
+			scrollbar_.reset(new Scrollbar(
+			   this, sb_x, sb_y, sb_w, sb_h, UI::PanelStyle::kFsMenu, orientation_ == Horizontal));
 			scrollbar_->moved.connect(boost::bind(&Box::scrollbar_moved, this, _1));
 		} else {
 			scrollbar_->set_pos(Vector2i(sb_x, sb_y));

=== modified file 'src/ui_basic/button.cc'
--- src/ui_basic/button.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/button.cc	2018-05-12 13:15:45 +0000
@@ -20,8 +20,10 @@
 #include "ui_basic/button.h"
 
 #include "graphic/font_handler1.h"
+#include "graphic/graphic.h"
 #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"
@@ -32,6 +34,36 @@
 // size.
 constexpr int kButtonImageMargin = 2;
 
+Button::Button  //  Common constructor
+   (Panel* const parent,
+    const std::string& name,
+    int32_t const x,
+    int32_t const y,
+    uint32_t const w,
+    uint32_t const h,
+    UI::ButtonStyle init_style,
+    const Image* title_image,
+    const std::string& title_text,
+    const std::string& tooltip_text,
+    UI::Button::VisualState init_state,
+    ImageMode mode)
+   : NamedPanel(parent, name, x, y, w, h, tooltip_text),
+     highlighted_(false),
+     pressed_(false),
+     enabled_(true),
+     visual_state_(init_state),
+     disable_style_(ButtonDisableStyle::kMonochrome),
+     repeating_(false),
+     image_mode_(mode),
+     time_nextact_(0),
+     title_(title_text),
+     title_image_(title_image),
+     background_style_(g_gr->styles().button_style(init_style)),
+     clr_down_(229, 161, 2) {
+	set_thinks(false);
+	set_can_focus(true);
+}
+
 Button::Button  //  for textual buttons. If h = 0, h will resize according to the font's height.
    (Panel* const parent,
     const std::string& name,
@@ -39,31 +71,28 @@
     int32_t const y,
     uint32_t const w,
     uint32_t const h,
-    const Image* bg_pic,
+    UI::ButtonStyle init_style,
     const std::string& title_text,
     const std::string& tooltip_text,
-    UI::Button::Style init_style)
-   : NamedPanel(parent, name, x, y, w, h, tooltip_text),
-     highlighted_(false),
-     pressed_(false),
-     enabled_(true),
-     style_(init_style),
-     disable_style_(ButtonDisableStyle::kMonochrome),
-     repeating_(false),
-     image_mode_(UI::Button::ImageMode::kShrink),
-     time_nextact_(0),
-     title_(title_text),
-     pic_background_(bg_pic),
-     pic_custom_(nullptr),
-     clr_down_(229, 161, 2) {
+    UI::Button::VisualState init_state)
+   : Button(parent,
+            name,
+            x,
+            y,
+            w,
+            h,
+            init_style,
+            nullptr,
+            title_text,
+            tooltip_text,
+            init_state,
+            UI::Button::ImageMode::kShrink) {
 	// Automatically resize for font height and give it a margin.
 	if (h < 1) {
 		int new_height = text_height() + 4;
 		set_desired_size(w, new_height);
 		set_size(w, new_height);
 	}
-	set_thinks(false);
-	set_can_focus(true);
 }
 
 Button::Button  //  for pictorial buttons
@@ -73,25 +102,12 @@
     const int32_t y,
     const uint32_t w,
     const uint32_t h,
-    const Image* bg_pic,
-    const Image* fg_pic,
+    UI::ButtonStyle init_style,
+    const Image* title_image,
     const std::string& tooltip_text,
-    UI::Button::Style init_style,
+    UI::Button::VisualState init_state,
     ImageMode mode)
-   : NamedPanel(parent, name, x, y, w, h, tooltip_text),
-     highlighted_(false),
-     pressed_(false),
-     enabled_(true),
-     style_(init_style),
-     disable_style_(ButtonDisableStyle::kMonochrome),
-     repeating_(false),
-     image_mode_(mode),
-     time_nextact_(0),
-     pic_background_(bg_pic),
-     pic_custom_(fg_pic),
-     clr_down_(229, 161, 2) {
-	set_thinks(false);
-	set_can_focus(true);
+   : Button(parent, name, x, y, w, h, init_style, title_image, "", tooltip_text, init_state, mode) {
 }
 
 Button::~Button() {
@@ -103,10 +119,10 @@
 void Button::set_pic(const Image* pic) {
 	title_.clear();
 
-	if (pic_custom_ == pic)
+	if (title_image_ == pic)
 		return;
 
-	pic_custom_ = pic;
+	title_image_ = pic;
 }
 
 /**
@@ -116,7 +132,7 @@
 	if (title_ == title)
 		return;
 
-	pic_custom_ = nullptr;
+	title_image_ = nullptr;
 	title_ = title;
 }
 
@@ -148,57 +164,53 @@
  * Redraw the button
 */
 void Button::draw(RenderTarget& dst) {
-	const bool is_flat = (enabled_ && style_ == Style::kFlat) ||
+	const bool is_flat = (enabled_ && visual_state_ == VisualState::kFlat) ||
 	                     (!enabled_ && static_cast<int>(disable_style_ & ButtonDisableStyle::kFlat));
 	const bool is_permpressed =
-	   (enabled_ && style_ == Style::kPermpressed) ||
+	   (enabled_ && visual_state_ == VisualState::kPermpressed) ||
 	   (!enabled_ && static_cast<int>(disable_style_ & ButtonDisableStyle::kPermpressed));
 	const bool is_monochrome =
 	   !enabled_ && static_cast<int>(disable_style_ & ButtonDisableStyle::kMonochrome);
 
 	// Draw the background
-	if (pic_background_) {
-		dst.fill_rect(Recti(0, 0, get_w(), get_h()), RGBAColor(0, 0, 0, 255));
-		dst.tile(
-		   Recti(Vector2i::zero(), get_w(), get_h()), pic_background_, Vector2i(get_x(), get_y()));
-	}
+	draw_background(dst, *background_style_);
 
 	if (is_flat && highlighted_)
 		dst.brighten_rect(Recti(0, 0, get_w(), get_h()), MOUSE_OVER_BRIGHT_FACTOR);
 
 	//  If we've got a picture, draw it centered
-	if (pic_custom_) {
+	if (title_image_) {
 		if (image_mode_ == UI::Button::ImageMode::kUnscaled) {
 			if (!is_monochrome) {
-				dst.blit(Vector2i((get_w() - static_cast<int32_t>(pic_custom_->width())) / 2,
-				                  (get_h() - static_cast<int32_t>(pic_custom_->height())) / 2),
-				         pic_custom_);
+				dst.blit(Vector2i((get_w() - static_cast<int32_t>(title_image_->width())) / 2,
+				                  (get_h() - static_cast<int32_t>(title_image_->height())) / 2),
+				         title_image_);
 			} else {
 				dst.blit_monochrome(
-				   Vector2i((get_w() - static_cast<int32_t>(pic_custom_->width())) / 2,
-				            (get_h() - static_cast<int32_t>(pic_custom_->height())) / 2),
-				   pic_custom_, RGBAColor(255, 255, 255, 127));
+				   Vector2i((get_w() - static_cast<int32_t>(title_image_->width())) / 2,
+				            (get_h() - static_cast<int32_t>(title_image_->height())) / 2),
+				   title_image_, RGBAColor(255, 255, 255, 127));
 			}
 		} else {
 			const int max_image_w = get_w() - 2 * kButtonImageMargin;
 			const int max_image_h = get_h() - 2 * kButtonImageMargin;
 			const float image_scale =
-			   std::min(1.f, std::min(static_cast<float>(max_image_w) / pic_custom_->width(),
-			                          static_cast<float>(max_image_h) / pic_custom_->height()));
-			int blit_width = image_scale * pic_custom_->width();
-			int blit_height = image_scale * pic_custom_->height();
+			   std::min(1.f, std::min(static_cast<float>(max_image_w) / title_image_->width(),
+			                          static_cast<float>(max_image_h) / title_image_->height()));
+			int blit_width = image_scale * title_image_->width();
+			int blit_height = image_scale * title_image_->height();
 
 			if (!is_monochrome) {
 				dst.blitrect_scale(Rectf((get_w() - blit_width) / 2.f, (get_h() - blit_height) / 2.f,
 				                         blit_width, blit_height),
-				                   pic_custom_,
-				                   Recti(0, 0, pic_custom_->width(), pic_custom_->height()), 1.,
+				                   title_image_,
+				                   Recti(0, 0, title_image_->width(), title_image_->height()), 1.,
 				                   BlendMode::UseAlpha);
 			} else {
 				dst.blitrect_scale_monochrome(
 				   Rectf((get_w() - blit_width) / 2.f, (get_h() - blit_height) / 2.f, blit_width,
 				         blit_height),
-				   pic_custom_, Recti(0, 0, pic_custom_->width(), pic_custom_->height()),
+				   title_image_, Recti(0, 0, title_image_->width(), title_image_->height()),
 				   RGBAColor(255, 255, 255, 127));
 			}
 		}
@@ -341,8 +353,8 @@
 	return true;  // We handle this always by lighting up
 }
 
-void Button::set_style(UI::Button::Style input_style) {
-	style_ = input_style;
+void Button::set_visual_state(UI::Button::VisualState input_state) {
+	visual_state_ = input_state;
 }
 
 void Button::set_disable_style(UI::ButtonDisableStyle input_style) {
@@ -350,18 +362,19 @@
 }
 
 void Button::set_perm_pressed(bool pressed) {
-	set_style(pressed ? UI::Button::Style::kPermpressed : UI::Button::Style::kRaised);
+	set_visual_state(pressed ? UI::Button::VisualState::kPermpressed :
+	                           UI::Button::VisualState::kRaised);
 }
 
 void Button::toggle() {
-	switch (style_) {
-	case UI::Button::Style::kRaised:
-		style_ = UI::Button::Style::kPermpressed;
-		break;
-	case UI::Button::Style::kPermpressed:
-		style_ = UI::Button::Style::kRaised;
-		break;
-	case UI::Button::Style::kFlat:
+	switch (visual_state_) {
+	case UI::Button::VisualState::kRaised:
+		visual_state_ = UI::Button::VisualState::kPermpressed;
+		break;
+	case UI::Button::VisualState::kPermpressed:
+		visual_state_ = UI::Button::VisualState::kRaised;
+		break;
+	case UI::Button::VisualState::kFlat:
 		break;  // Do nothing for flat buttons
 	}
 }

=== modified file 'src/ui_basic/button.h'
--- src/ui_basic/button.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/button.h	2018-05-12 13:15:45 +0000
@@ -48,7 +48,7 @@
 /// This is all that is needed in most cases, but if there is a need to give a
 /// callback function to the button, there are some templates for that below.
 struct Button : public NamedPanel {
-	enum class Style {
+	enum class VisualState {
 		kRaised,       // Normal raised Button
 		kPermpressed,  // Button will appear pressed
 		kFlat          // Flat button with simple coloured outline
@@ -59,6 +59,23 @@
 		kUnscaled  // Show the foreground image without any scaling
 	};
 
+private:
+	Button  // Common constructor
+	   (Panel* const parent,
+	    const std::string& name,
+	    int32_t const x,
+	    int32_t const y,
+	    uint32_t const w,
+	    uint32_t const h,
+	    UI::ButtonStyle style,
+	    const Image* title_image,
+	    const std::string& title_text,
+	    const std::string& tooltip_text,
+	    UI::Button::VisualState state,
+	    UI::Button::ImageMode mode);
+
+public:
+
 	/**
 	 * Text conventions: Title Case for the 'title_text', Sentence case for the 'tooltip_text'
 	 */
@@ -69,10 +86,10 @@
 	    int32_t const y,
 	    uint32_t const w,
 	    uint32_t const h,
-	    const Image* background_picture_id,
+	    UI::ButtonStyle style,
 	    const std::string& title_text,
 	    const std::string& tooltip_text = std::string(),
-	    UI::Button::Style init_style = UI::Button::Style::kRaised);
+	    UI::Button::VisualState state = UI::Button::VisualState::kRaised);
 
 	/**
 	 * Text conventions: Sentence case for the 'tooltip_text'
@@ -84,10 +101,10 @@
 	    const int32_t y,
 	    const uint32_t w,
 	    const uint32_t h,
-	    const Image* background_picture_id,
-	    const Image* foreground_picture_id,
+	    UI::ButtonStyle style,
+	    const Image* title_image,
 	    const std::string& tooltip_text = std::string(),
-	    UI::Button::Style init_style = UI::Button::Style::kRaised,
+	    UI::Button::VisualState state = UI::Button::VisualState::kRaised,
 	    UI::Button::ImageMode mode = UI::Button::ImageMode::kShrink);
 	~Button() override;
 
@@ -118,9 +135,9 @@
 	bool handle_mousemove(uint8_t, int32_t, int32_t, int32_t, int32_t) override;
 
 	/// Sets the visual style of the button
-	void set_style(UI::Button::Style input_style);
-	UI::Button::Style style() const {
-		return style_;
+	void set_visual_state(UI::Button::VisualState state);
+	UI::Button::VisualState style() const {
+		return visual_state_;
 	}
 
 	/// Sets the visual style of the disabled button
@@ -143,19 +160,18 @@
 	bool highlighted_;  //  mouse is over the button
 	bool pressed_;      //  mouse is clicked over the button
 	bool enabled_;
-	UI::Button::Style style_;
+	UI::Button::VisualState visual_state_;
 	UI::ButtonDisableStyle disable_style_;
 	bool repeating_;
 	const UI::Button::ImageMode image_mode_;
 
 	uint32_t time_nextact_;
 
-	std::string title_;  //  title string used when pic_custom_ == 0
-
-	const Image* pic_background_;  //  background texture (picture ID)
-	const Image* pic_custom_;      //  custom icon on the button
-
-	RGBColor clr_down_;  //  color of border while a flat button is "down"
+	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.
+	RGBColor clr_down_;                           //  color of border while a flat button is "down"
 };
 
 }  // namespace UI

=== modified file 'src/ui_basic/dropdown.cc'
--- src/ui_basic/dropdown.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/dropdown.cc	2018-05-12 13:15:45 +0000
@@ -27,6 +27,7 @@
 #include "base/macros.h"
 #include "graphic/align.h"
 #include "graphic/font_handler1.h"
+#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "ui_basic/mouse_constants.h"
 #include "ui_basic/tabpanel.h"
@@ -53,8 +54,7 @@
                            int button_dimension,
                            const std::string& label,
                            const DropdownType type,
-                           const Image* background,
-                           const Image* button_background)
+                           UI::PanelStyle style)
    : UI::Panel(parent,
                x,
                y,
@@ -76,7 +76,9 @@
                                     0,
                                     button_dimension,
                                     get_h(),
-                                    button_background,
+                                    style == UI::PanelStyle::kFsMenu ?
+                                       UI::ButtonStyle::kFsMenuMenu :
+                                       UI::ButtonStyle::kWuiSecondary,
                                     g_gr->images().get("images/ui_basic/scrollbar_down.png"),
                                     pgettext("dropdown", "Select Item")) :
                      nullptr),
@@ -88,7 +90,8 @@
                         w - button_dimension :
                         type == DropdownType::kTextualNarrow ? w : button_dimension,
                      get_h(),
-                     background,
+                     style == UI::PanelStyle::kFsMenu ? UI::ButtonStyle::kFsMenuSecondary :
+                                                        UI::ButtonStyle::kWuiSecondary,
                      label),
      label_(label),
      type_(type),
@@ -107,12 +110,9 @@
 	while (parent->get_parent() && !is_a(UI::TabPanel, parent->get_parent())) {
 		parent = parent->get_parent();
 	}
-	list_ = new UI::Listselect<uintptr_t>(
-	   parent, 0, 0, w, 0, button_background, ListselectLayout::kDropdown);
+	list_ = new UI::Listselect<uintptr_t>(parent, 0, 0, w, 0, style, ListselectLayout::kDropdown);
 
 	list_->set_visible(false);
-	list_->set_background(background);
-
 	button_box_.add(&display_button_);
 	display_button_.sigclicked.connect(boost::bind(&BaseDropdown::toggle_list, this));
 	if (push_button_ != nullptr) {

=== modified file 'src/ui_basic/dropdown.h'
--- src/ui_basic/dropdown.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/dropdown.h	2018-05-12 13:15:45 +0000
@@ -25,7 +25,6 @@
 
 #include <boost/signals2.hpp>
 
-#include "graphic/graphic.h"
 #include "graphic/image.h"
 #include "notifications/note_ids.h"
 #include "notifications/notifications.h"
@@ -60,8 +59,7 @@
 	/// dropdowns, this is both the width and the height of the button.
 	/// \param label              a label to prefix to the selected entry on the display button.
 	/// \param type               whether this is a textual or pictorial dropdown
-	/// \param background         the background image for this dropdown
-	/// \param button_background  the background image all buttons in this dropdown
+	/// \param style              the style used for buttons and background
 	BaseDropdown(Panel* parent,
 	             int32_t x,
 	             int32_t y,
@@ -70,8 +68,7 @@
 	             int button_dimension,
 	             const std::string& label,
 	             const DropdownType type,
-	             const Image* background,
-	             const Image* button_background);
+	             PanelStyle style);
 	~BaseDropdown() override;
 
 public:
@@ -206,9 +203,7 @@
 	/// dropdowns, this is both the width and the height of the button.
 	/// \param label              a label to prefix to the selected entry on the display button.
 	/// \param type               whether this is a textual or pictorial dropdown
-	/// \param background         the background image for this dropdown
-	/// \param button_background  the background image all buttons in this dropdown
-	///
+	/// \param style              the style used for buttons and background
 	/// Text conventions: Title Case for all elements
 	Dropdown(Panel* parent,
 	         int32_t x,
@@ -217,19 +212,9 @@
 	         uint32_t list_h,
 	         int button_dimension,
 	         const std::string& label,
-	         const DropdownType type = DropdownType::kTextual,
-	         const Image* background = g_gr->images().get("images/ui_basic/but1.png"),
-	         const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"))
-	   : BaseDropdown(parent,
-	                  x,
-	                  y,
-	                  list_w,
-	                  list_h,
-	                  button_dimension,
-	                  label,
-	                  type,
-	                  background,
-	                  button_background) {
+	         const DropdownType type,
+	         PanelStyle style)
+	   : BaseDropdown(parent, x, y, list_w, list_h, button_dimension, label, type, style) {
 	}
 	~Dropdown() {
 		entry_cache_.clear();

=== modified file 'src/ui_basic/editbox.cc'
--- src/ui_basic/editbox.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/editbox.cc	2018-05-12 13:15:45 +0000
@@ -24,9 +24,11 @@
 #include <SDL_keycode.h>
 #include <boost/format.hpp>
 
+#include "graphic/color.h"
 #include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/style_manager.h"
 #include "graphic/text/bidi.h"
 #include "graphic/text/font_set.h"
 #include "graphic/text/rt_errors.h"
@@ -53,8 +55,8 @@
 	uint32_t fontsize;
 	/*@}*/
 
-	/// Background tile style.
-	const Image* background;
+	/// Background color and texture
+	const UI::PanelStyleInfo* background_style;
 
 	/// Maximum number of characters in the input
 	uint32_t maxLength;
@@ -78,7 +80,7 @@
                  uint32_t w,
                  uint32_t h,
                  int margin_y,
-                 const Image* background,
+                 UI::PanelStyle style,
                  int font_size)
    : Panel(parent, x, y, w, h > 0 ? h : text_height(font_size) + 2 * margin_y),
      m_(new EditBoxImpl),
@@ -86,7 +88,7 @@
      history_position_(-1) {
 	set_thinks(false);
 
-	m_->background = background;
+	m_->background_style = g_gr->styles().editbox_style(style);
 	m_->fontname = UI::g_fh1->fontset()->sans();
 	m_->fontsize = font_size;
 
@@ -340,9 +342,7 @@
 }
 
 void EditBox::draw(RenderTarget& dst) {
-
-	// Draw the background
-	dst.tile(Recti(0, 0, get_w(), get_h()), m_->background, Vector2i(get_x(), get_y()));
+	draw_background(dst, *m_->background_style);
 
 	// Draw border.
 	if (get_w() >= 2 && get_h() >= 2) {

=== modified file 'src/ui_basic/editbox.h'
--- src/ui_basic/editbox.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/editbox.h	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 #include <boost/signals2.hpp>
 
 #include "graphic/align.h"
-#include "graphic/graphic.h"
 #include "ui_basic/button.h"
 
 #define CHAT_HISTORY_SIZE 5
@@ -49,9 +48,9 @@
 	        int32_t x,
 	        int32_t y,
 	        uint32_t w,
-	        uint32_t h = 0,
-	        int margin_y = 2,
-	        const Image* background = g_gr->images().get("images/ui_basic/but2.png"),
+	        uint32_t h,
+	        int margin_y,
+	        UI::PanelStyle style,
 	        int font_size = UI_FONT_SIZE_SMALL);
 	~EditBox() override;
 

=== modified file 'src/ui_basic/fileview_panel.cc'
--- src/ui_basic/fileview_panel.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/fileview_panel.cc	2018-05-12 13:15:45 +0000
@@ -29,11 +29,14 @@
 
 namespace UI {
 
-FileViewPanel::FileViewPanel(Panel* parent, const Image* background, TabPanel::Type border_type)
-   : TabPanel(parent, background, border_type),
-     padding_(5),
-     contents_width_(0),
-     contents_height_(0) {
+FileViewPanel::FileViewPanel(Panel* parent,
+                             UI::PanelStyle scrollbar_style,
+                             TabPanelStyle background_style)
+   : TabPanel(parent, background_style),
+	  padding_(5),
+	  contents_width_(0),
+	  contents_height_(0),
+	  style_(scrollbar_style) {
 	layout();
 }
 
@@ -53,7 +56,7 @@
 	size_t index = boxes_.size() - 1;
 
 	UI::MultilineTextarea* textarea =
-	   new UI::MultilineTextarea(boxes_.at(index).get(), 0, 0, Scrollbar::kSize, 0);
+	   new UI::MultilineTextarea(boxes_.at(index).get(), 0, 0, Scrollbar::kSize, 0, style_);
 	try {
 		textarea->force_new_renderer();
 		textarea->set_text(content);
@@ -85,9 +88,9 @@
 
 	// If there is a border, we have less space for the contents
 	contents_width_ = std::max(
-	   0, border_type_ == TabPanel::Type::kNoBorder ? get_w() - padding_ : get_w() - 2 * padding_);
+	   0, style_ == UI::PanelStyle::kFsMenu ? get_w() - padding_ : get_w() - 2 * padding_);
 
-	contents_height_ = std::max(0, border_type_ == TabPanel::Type::kNoBorder ?
+	contents_height_ = std::max(0, style_ == UI::PanelStyle::kFsMenu ?
 	                                  get_inner_h() - 2 * padding_ - UI::kTabPanelButtonHeight :
 	                                  get_inner_h() - 3 * padding_ - UI::kTabPanelButtonHeight);
 

=== modified file 'src/ui_basic/fileview_panel.h'
--- src/ui_basic/fileview_panel.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/fileview_panel.h	2018-05-12 13:15:45 +0000
@@ -35,9 +35,7 @@
  */
 class FileViewPanel : public TabPanel {
 public:
-	FileViewPanel(Panel* parent,
-	              const Image* background,
-	              TabPanel::Type border_type = TabPanel::Type::kNoBorder);
+	FileViewPanel(Panel* parent, UI::PanelStyle scrollbar_style, UI::TabPanelStyle background_style);
 
 	/// Adds a tab with the contents of 'lua_script'.
 	/// 'lua_script' must return a table that contains 'title' and 'text' keys.
@@ -49,6 +47,7 @@
 	const int padding_;
 	int contents_width_;
 	int contents_height_;
+	const UI::PanelStyle style_;
 
 	// Tab contents
 	std::vector<std::unique_ptr<Box>> boxes_;

=== modified file 'src/ui_basic/fullscreen_window.cc'
--- src/ui_basic/fullscreen_window.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/fullscreen_window.cc	2018-05-12 13:15:45 +0000
@@ -20,10 +20,10 @@
 #include "ui_basic/fullscreen_window.h"
 
 #include <cstdio>
+#include <memory>
 
-#include "graphic/graphic.h"
-#include "graphic/image.h"
 #include "graphic/rendertarget.h"
+#include "graphic/style_manager.h"
 #include "graphic/text_constants.h"
 
 /*
@@ -37,23 +37,21 @@
 
 FullscreenWindow::FullscreenWindow()
    : UI::Panel(nullptr, 0, 0, g_gr->get_xres(), g_gr->get_yres()),
-     background_image_("images/ui_fsmenu/background.png") {
+     background_image_(kTemplateDir + "fsmenu/background.png") {
 	graphic_resolution_changed_subscriber_ = Notifications::subscribe<GraphicResolutionChanged>(
 	   [this](const GraphicResolutionChanged& message) {
 		   set_size(message.width, message.height);
 		   layout();
 		});
-	set_frame_image(FullscreenWindow::Frames::kCornerTopLeft, "images/ui_fsmenu/top_left.png");
-	set_frame_image(FullscreenWindow::Frames::kCornerTopRight, "images/ui_fsmenu/top_right.png");
-	set_frame_image(FullscreenWindow::Frames::kCornerBottomLeft, "images/ui_fsmenu/bottom_left.png");
-	set_frame_image(
-	   FullscreenWindow::Frames::kCornerBottomRight, "images/ui_fsmenu/bottom_right.png");
-	set_frame_image(FullscreenWindow::Frames::kEdgeLeftTile, "images/ui_fsmenu/left.png");
-	set_frame_image(FullscreenWindow::Frames::kEdgeRightTile, "images/ui_fsmenu/right.png");
-	set_frame_image(FullscreenWindow::Frames::kEdgeTopTile, "images/ui_fsmenu/top.png");
-	set_frame_image(FullscreenWindow::Frames::kEdgeBottomTile, "images/ui_fsmenu/bottom.png");
-	add_overlay_image("images/ui_fsmenu/center.png",
-	                  FullscreenWindow::Alignment(UI::Align::kCenter, UI::Align::kCenter));
+	set_frame_image(FullscreenWindow::Frames::kCornerTopLeft, "fsmenu/top_left.png");
+	set_frame_image(FullscreenWindow::Frames::kCornerTopRight, "fsmenu/top_right.png");
+	set_frame_image(FullscreenWindow::Frames::kCornerBottomLeft, "fsmenu/bottom_left.png");
+	set_frame_image(FullscreenWindow::Frames::kCornerBottomRight, "fsmenu/bottom_right.png");
+	set_frame_image(FullscreenWindow::Frames::kEdgeLeftTile, "fsmenu/left.png");
+	set_frame_image(FullscreenWindow::Frames::kEdgeRightTile, "fsmenu/right.png");
+	set_frame_image(FullscreenWindow::Frames::kEdgeTopTile, "fsmenu/top.png");
+	set_frame_image(FullscreenWindow::Frames::kEdgeBottomTile, "fsmenu/bottom.png");
+	set_frame_image(FullscreenWindow::Frames::kCenter, "fsmenu/center.png");
 }
 
 FullscreenWindow::~FullscreenWindow() {
@@ -62,7 +60,7 @@
 }
 
 void FullscreenWindow::add_overlay_image(const std::string& filename, Alignment align) {
-	overlays_.push_back(std::make_pair(g_gr->images().get(filename), align));
+	overlays_.push_back(std::unique_ptr<const Overlay>(new Overlay(g_gr->images().get(filename), align)));
 }
 
 void FullscreenWindow::clear_overlays() {
@@ -70,7 +68,7 @@
 }
 
 void FullscreenWindow::set_frame_image(FullscreenWindow::Frames id, const std::string& filename) {
-	frame_overlays_.insert(std::make_pair(id, g_gr->images().get(filename)));
+	frame_overlays_.insert(std::make_pair(id, g_gr->images().get(kTemplateDir + filename)));
 }
 
 const Image* FullscreenWindow::get_frame_image(FullscreenWindow::Frames id) const {
@@ -88,20 +86,24 @@
 	// Overall background
 	dst.tile(Recti(0, 0, get_w(), get_h()), g_gr->images().get(background_image_), Vector2i::zero());
 
+	// Center background
+	blit_image(dst, get_frame_image(FullscreenWindow::Frames::kCenter),
+	           FullscreenWindow::Alignment(UI::Align::kCenter, UI::Align::kCenter));
+
 	// Optional overlays
 	for (const auto& overlay : overlays_) {
-		blit_image(dst, overlay.first, overlay.second);
+		blit_image(dst, overlay->image, overlay->align);
 	}
 
 	// Frame edges
 	blit_image(dst, get_frame_image(FullscreenWindow::Frames::kEdgeLeftTile),
-	           Alignment(UI::Align::kLeft, UI::Align::kTop), kVertical);
+	           Alignment(UI::Align::kLeft, UI::Align::kTop), Tiling::kVertical);
 	blit_image(dst, get_frame_image(FullscreenWindow::Frames::kEdgeRightTile),
-	           Alignment(UI::Align::kRight, UI::Align::kTop), kVertical);
+	           Alignment(UI::Align::kRight, UI::Align::kTop), Tiling::kVertical);
 	blit_image(dst, get_frame_image(FullscreenWindow::Frames::kEdgeTopTile),
-	           Alignment(UI::Align::kLeft, UI::Align::kTop), kHorizontal);
+	           Alignment(UI::Align::kLeft, UI::Align::kTop), Tiling::kHorizontal);
 	blit_image(dst, get_frame_image(FullscreenWindow::Frames::kEdgeBottomTile),
-	           Alignment(UI::Align::kLeft, UI::Align::kBottom), kHorizontal);
+	           Alignment(UI::Align::kLeft, UI::Align::kBottom), Tiling::kHorizontal);
 
 	// Frame corners
 	blit_image(dst, get_frame_image(FullscreenWindow::Frames::kCornerTopLeft),
@@ -114,43 +116,61 @@
 	           FullscreenWindow::Alignment(UI::Align::kRight, UI::Align::kBottom));
 }
 
+Recti FullscreenWindow::calculate_rect(const Image* image, Alignment align, Tiling tiling) {
+	int x = 0;
+	int y = 0;
+	int w = image->width();
+	int h = image->height();
+	const int available_width = g_gr->get_xres();
+	const int available_height = g_gr->get_yres();
+
+	if (tiling != Tiling::kNone) {
+		w = (tiling == Tiling::kVertical) ? w : available_width;
+		h = (tiling == Tiling::kHorizontal) ? h : available_height;
+	} else {
+		const float scale =
+		   std::min(1.f, std::max(static_cast<float>(available_width) / image->width(), static_cast<float>(available_height) / image->height()));
+		w = scale * image->width();
+		h = scale * image->height();
+	}
+
+	// Adjust horizontal alignment
+	switch (align.halign) {
+	case UI::Align::kRight:
+		x = available_width - w;
+		break;
+	case UI::Align::kCenter:
+		x = (available_width - w) / 2;
+		break;
+	case UI::Align::kLeft:
+		break;
+	}
+
+	// Adjust vertical alignment
+	switch (align.valign) {
+	case UI::Align::kBottom:
+		y = available_height - h;
+		break;
+	case UI::Align::kCenter:
+		y = (available_height - h) / 2;
+		break;
+	case UI::Align::kTop:
+		break;
+	}
+	return Recti(x, y, w, h);
+}
+
 void FullscreenWindow::blit_image(RenderTarget& dst,
                                   const Image* image,
                                   Alignment align,
                                   Tiling tiling) {
 	if (image) {
-		int x = 0;
-		int y = 0;
-		// Adjust horizontal alignment
-		switch (align.halign) {
-		case UI::Align::kRight:
-			x = get_w() - image->width();
-			break;
-		case UI::Align::kCenter:
-			x = (get_w() - image->width()) / 2;
-			break;
-		case UI::Align::kLeft:
-			break;
-		}
-
-		// Adjust vertical alignment
-		switch (align.valign) {
-		case UI::Align::kBottom:
-			y = get_h() - image->height();
-			break;
-		case UI::Align::kCenter:
-			y = (get_h() - image->height()) / 2;
-			break;
-		case UI::Align::kTop:
-			break;
-		}
-
-		if (tiling != kNone) {
-			const int w = (tiling == kVertical) ? image->width() : get_w();
-			const int h = (tiling == kHorizontal) ? image->height() : get_h();
-			dst.tile(Recti(x, y, w, h), image, Vector2i::zero());
+		const Recti dest = FullscreenWindow::calculate_rect(image, align, tiling);
+		if (tiling != Tiling::kNone) {
+			dst.tile(dest, image, Vector2i::zero());
 		} else {
-			dst.blit(Vector2i(x, y), image);
+			dst.blitrect_scale(dest.cast<float>(), image, Recti(0, 0, image->width(), image->height()),
+			                   1., BlendMode::UseAlpha);
 		}
 	}
 }

=== modified file 'src/ui_basic/fullscreen_window.h'
--- src/ui_basic/fullscreen_window.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/fullscreen_window.h	2018-05-12 13:15:45 +0000
@@ -48,7 +48,8 @@
 		kEdgeLeftTile,
 		kEdgeRightTile,
 		kEdgeTopTile,
-		kEdgeBottomTile
+		kEdgeBottomTile,
+		kCenter
 	};
 	struct FramesHash {
 		template <typename T> int operator()(T t) const {
@@ -88,20 +89,33 @@
 	/// Returns the image for the given frame position.
 	const Image* get_frame_image(FullscreenWindow::Frames id) const;
 
-	enum Tiling { kNone, kHorizontal, kVertical };
+	enum class Tiling { kNone, kHorizontal, kVertical };
+
+	/// Calculate the rect that the image will be blitted to.
+	static Recti calculate_rect(const Image* image, Alignment align, Tiling tiling);
 
 	/**
 	 * Blit an image according to the given 'align'.
 	 * If 'tiling' is set to 'UI::Align::kVertical' or 'UI::Align::kHorizontal', the image will be
-	 * tiled.
+	 * tiled. If the image is bigger than the panel, it will get scaled down.
 	 */
-	void blit_image(RenderTarget& dst, const Image* image, Alignment align, Tiling tiling = kNone);
+	void blit_image(RenderTarget& dst,
+	                const Image* image,
+	                Alignment align,
+	                Tiling tiling = Tiling::kNone);
 
 	const std::string background_image_;
+
 	/// These overlay images will be blitted in the order they were added and according to the given
 	/// align.
-	std::vector<std::pair<const Image*, Alignment>> overlays_;
-	/// Images for the edges. They will be blitted in top of the overlays_.
+	struct Overlay {
+		Overlay(const Image* init_image, const FullscreenWindow::Alignment& init_align) : image(init_image), align(init_align) {}
+		const Image* image;
+		const FullscreenWindow::Alignment align;
+	};
+	std::vector<std::unique_ptr<const Overlay>> overlays_;
+
+	/// Images for the edges and the center. Except for the center one, they will be blitted on top of the overlays_.
 	std::unordered_map<FullscreenWindow::Frames, const Image*, FullscreenWindow::FramesHash>
 	   frame_overlays_;
 

=== modified file 'src/ui_basic/icongrid.cc'
--- src/ui_basic/icongrid.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/icongrid.cc	2018-05-12 13:15:45 +0000
@@ -30,7 +30,6 @@
 	               int32_t y,
 	               uint32_t w,
 	               uint32_t h,
-	               const Image* background_picture_id,
 	               const Image* foreground_picture_id,
 	               uint32_t callback_argument_id,
 	               const std::string& tooltip_text)
@@ -40,10 +39,10 @@
 	            y,
 	            w,
 	            h,
-	            background_picture_id,
+	            UI::ButtonStyle::kWuiBuildingStats,
 	            foreground_picture_id,
 	            tooltip_text,
-	            UI::Button::Style::kFlat),
+	            UI::Button::VisualState::kFlat),
 	     icongrid_(parent),
 	     callback_argument_id_(callback_argument_id) {
 	}
@@ -97,8 +96,8 @@
 	uint32_t x = (idx % columns_) * cell_width_;
 	uint32_t y = (idx / columns_) * cell_height_;
 
-	UI::Button* btn = new IconGridButton(
-	   *this, name, x, y, cell_width_, cell_height_, nullptr, pic, idx, tooltip_text);
+	UI::Button* btn =
+	   new IconGridButton(*this, name, x, y, cell_width_, cell_height_, pic, idx, tooltip_text);
 	btn->sigclicked.connect(boost::bind(&IconGrid::clicked_button, this, idx));
 
 	return idx;

=== modified file 'src/ui_basic/listselect.cc'
--- src/ui_basic/listselect.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/listselect.cc	2018-05-12 13:15:45 +0000
@@ -28,6 +28,7 @@
 #include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/style_manager.h"
 #include "graphic/text/bidi.h"
 #include "graphic/text_constants.h"
 #include "graphic/text_layout.h"
@@ -50,17 +51,19 @@
                                const int32_t y,
                                const uint32_t w,
                                const uint32_t h,
-                               const Image* button_background,
+                               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, button_background),
+     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),
-     background_(nullptr) {
+     background_style_(selection_mode == ListselectLayout::kDropdown ?
+                          g_gr->styles().dropdown_style(style) :
+								  nullptr) {
 	set_thinks(false);
 
 	scrollbar_.moved.connect(boost::bind(&BaseListselect::set_scrollpos, this, _1));
@@ -313,8 +316,8 @@
 	uint32_t idx = scrollpos_ / get_lineheight();
 	int y = 1 + idx * get_lineheight() - scrollpos_;
 
-	if (background_ != nullptr) {
-		dst.tile(Recti(Vector2i::zero(), get_w(), get_h()), background_, Vector2i::zero());
+	if (background_style_ != nullptr) {
+		draw_background(dst, *background_style_);
 	}
 
 	if (selection_mode_ == ListselectLayout::kDropdown) {

=== modified file 'src/ui_basic/listselect.h'
--- src/ui_basic/listselect.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/listselect.h	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 #include <boost/signals2.hpp>
 
 #include "graphic/color.h"
-#include "graphic/graphic.h"
 #include "ui_basic/panel.h"
 #include "ui_basic/scrollbar.h"
 
@@ -51,7 +50,7 @@
 	               int32_t y,
 	               uint32_t w,
 	               uint32_t h,
-	               const Image* button_background,
+	               PanelStyle style,
 	               ListselectLayout selection_mode = ListselectLayout::kPlain);
 	~BaseListselect() override;
 
@@ -108,10 +107,6 @@
 	const std::string& get_selected_tooltip() const;
 	const Image* get_selected_image() const;
 
-	void set_background(const Image* background) {
-		background_ = background;
-	}
-
 	///  Return the total height (text + spacing) occupied by a single line.
 	int get_lineheight() const;
 
@@ -153,7 +148,7 @@
 	uint32_t last_selection_;  // for double clicks
 	ListselectLayout selection_mode_;
 	const Image* check_pic_;
-	const Image* background_;
+	const UI::PanelStyleInfo* background_style_;  // Background color and texture. Not owned.
 	std::string current_tooltip_;
 };
 
@@ -163,9 +158,9 @@
 	           int32_t y,
 	           uint32_t w,
 	           uint32_t h,
-	           const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	           UI::PanelStyle style,
 	           ListselectLayout selection_mode = ListselectLayout::kPlain)
-	   : BaseListselect(parent, x, y, w, h, button_background, selection_mode) {
+	   : BaseListselect(parent, x, y, w, h, style, selection_mode) {
 	}
 
 	void add(const std::string& name,
@@ -193,10 +188,6 @@
 		return entry_cache_[BaseListselect::get_selected()];
 	}
 
-	void set_background(const Image* background) {
-		BaseListselect::set_background(background);
-	}
-
 private:
 	std::deque<Entry> entry_cache_;
 };
@@ -216,9 +207,9 @@
 	           int32_t y,
 	           uint32_t w,
 	           uint32_t h,
-	           const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	           UI::PanelStyle style,
 	           ListselectLayout selection_mode = ListselectLayout::kPlain)
-	   : Base(parent, x, y, w, h, button_background, selection_mode) {
+	   : Base(parent, x, y, w, h, style, selection_mode) {
 	}
 
 	void add(const std::string& name,
@@ -243,10 +234,6 @@
 	Entry& get_selected() const {
 		return *Base::get_selected();
 	}
-
-	void set_background(const Image* background) {
-		*Base::set_background(background);
-	}
 };
 }
 

=== modified file 'src/ui_basic/messagebox.cc'
--- src/ui_basic/messagebox.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/messagebox.cc	2018-05-12 13:15:45 +0000
@@ -71,26 +71,25 @@
 		scrollmode = MultilineTextarea::ScrollMode::kScrollNormal;
 	}
 
-	textarea_.reset(new MultilineTextarea(this, margin, margin, width - 2 * margin, height, text,
-	                                      align, g_gr->images().get("images/ui_basic/but1.png"),
-	                                      scrollmode));
+	textarea_.reset(new MultilineTextarea(this, margin, margin, width - 2 * margin, height,
+	                                      UI::PanelStyle::kWui, text, align, scrollmode));
 
 	// Now add the buttons
 	const int button_y = textarea_->get_y() + textarea_->get_h() + 2 * margin;
 	const int left_button_x = width / 3 - button_w / 2;
 	const int right_button_x = width * 2 / 3 - button_w / 2;
 
-	ok_button_.reset(new Button(
-	   this, "ok",
-	   type_ == MBoxType::kOk ? (width - button_w) / 2 :
-	                            UI::g_fh1->fontset()->is_rtl() ? left_button_x : right_button_x,
-	   button_y, button_w, 0, g_gr->images().get("images/ui_basic/but5.png"), _("OK")));
+	ok_button_.reset(new Button(this, "ok",
+	                            type_ == MBoxType::kOk ?
+	                               (width - button_w) / 2 :
+	                               UI::g_fh1->fontset()->is_rtl() ? left_button_x : right_button_x,
+	                            button_y, button_w, 0, UI::ButtonStyle::kWuiPrimary, _("OK")));
 	ok_button_->sigclicked.connect(boost::bind(&WLMessageBox::clicked_ok, boost::ref(*this)));
 
 	if (type_ == MBoxType::kOkCancel) {
-		cancel_button_.reset(new Button(
-		   this, "cancel", UI::g_fh1->fontset()->is_rtl() ? right_button_x : left_button_x, button_y,
-		   button_w, 0, g_gr->images().get("images/ui_basic/but1.png"), _("Cancel")));
+		cancel_button_.reset(
+		   new Button(this, "cancel", UI::g_fh1->fontset()->is_rtl() ? right_button_x : left_button_x,
+		              button_y, button_w, 0, UI::ButtonStyle::kWuiSecondary, _("Cancel")));
 		cancel_button_->sigclicked.connect(
 		   boost::bind(&WLMessageBox::clicked_back, boost::ref(*this)));
 	}

=== modified file 'src/ui_basic/multilineeditbox.cc'
--- src/ui_basic/multilineeditbox.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/multilineeditbox.cc	2018-05-12 13:15:45 +0000
@@ -25,6 +25,7 @@
 #include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/style_manager.h"
 #include "graphic/text_layout.h"
 #include "graphic/wordwrap.h"
 #include "ui_basic/mouse_constants.h"
@@ -40,8 +41,8 @@
 	/// The text in the edit box
 	std::string text;
 
-	/// Background tile style.
-	const Image* background;
+	/// Background color and texture
+	const UI::PanelStyleInfo* background_style;
 
 	/// Position of the cursor inside the text.
 	/// 0 indicates that the cursor is before the first character,
@@ -59,7 +60,7 @@
 	WordWrap ww;
 	/*@}*/
 
-	Data(MultilineEditbox&, const Image* init_background, const Image* button_background);
+	Data(MultilineEditbox&, const UI::PanelStyleInfo* style);
 	void refresh_ww();
 
 	void update();
@@ -81,28 +82,19 @@
 /**
  * Initialize an editbox that supports multiline strings.
 */
-MultilineEditbox::MultilineEditbox(Panel* parent,
-                                   int32_t x,
-                                   int32_t y,
-                                   uint32_t w,
-                                   uint32_t h,
-                                   const std::string& text,
-                                   const Image* background,
-                                   const Image* button_background)
-   : Panel(parent, x, y, w, h), d_(new Data(*this, background, button_background)) {
+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))) {
 	set_handle_mouse(true);
 	set_can_focus(true);
 	set_thinks(false);
 	set_handle_textinput();
-
-	set_text(text);
 }
 
-MultilineEditbox::Data::Data(MultilineEditbox& o,
-                             const Image* init_background,
-                             const Image* button_background)
-   : scrollbar(&o, o.get_w() - Scrollbar::kSize, 0, Scrollbar::kSize, o.get_h(), button_background),
-     background(init_background),
+MultilineEditbox::Data::Data(MultilineEditbox& o, const UI::PanelStyleInfo* style)
+   : scrollbar(
+        &o, o.get_w() - Scrollbar::kSize, 0, Scrollbar::kSize, o.get_h(), UI::PanelStyle::kWui),
+	  background_style(style),
      cursor_pos(0),
      lineheight(text_height()),
      maxbytes(std::min(g_gr->max_texture_size() / UI_FONT_SIZE_SMALL, 0xffff)),
@@ -408,8 +400,7 @@
  * Redraw the Editbox
  */
 void MultilineEditbox::draw(RenderTarget& dst) {
-	// Draw the background
-	dst.tile(Recti(Vector2i::zero(), get_w(), get_h()), d_->background, Vector2i(get_x(), get_y()));
+	draw_background(dst, *d_->background_style);
 
 	// Draw border.
 	if (get_w() >= 4 && get_h() >= 4) {

=== modified file 'src/ui_basic/multilineeditbox.h'
--- src/ui_basic/multilineeditbox.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/multilineeditbox.h	2018-05-12 13:15:45 +0000
@@ -24,7 +24,6 @@
 
 #include <boost/signals2.hpp>
 
-#include "graphic/graphic.h"
 #include "ui_basic/panel.h"
 
 namespace UI {
@@ -36,15 +35,7 @@
  * Text conventions: Sentence case for labels associated with thie editbox
  */
 struct MultilineEditbox : public Panel {
-	MultilineEditbox(
-	   Panel*,
-	   int32_t x,
-	   int32_t y,
-	   uint32_t w,
-	   uint32_t h,
-	   const std::string& text,
-	   const Image* background = g_gr->images().get("images/ui_basic/but2.png"),
-	   const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"));
+	MultilineEditbox(Panel*, int32_t x, int32_t y, uint32_t w, uint32_t h, PanelStyle style);
 
 	boost::signals2::signal<void()> changed;
 

=== modified file 'src/ui_basic/multilinetextarea.cc'
--- src/ui_basic/multilinetextarea.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/multilinetextarea.cc	2018-05-12 13:15:45 +0000
@@ -37,9 +37,9 @@
                                      const int32_t y,
                                      const uint32_t w,
                                      const uint32_t h,
+                                     UI::PanelStyle style,
                                      const std::string& text,
                                      const Align align,
-                                     const Image* button_background,
                                      MultilineTextarea::ScrollMode scroll_mode)
    : Panel(parent, x, y, w, h),
      text_(text),
@@ -47,8 +47,7 @@
      align_(align),
      force_new_renderer_(false),
      use_old_renderer_(false),
-     scrollbar_(this, get_w() - Scrollbar::kSize, 0, Scrollbar::kSize, h, button_background, false),
-     pic_background_(nullptr) {
+     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));
@@ -134,9 +133,6 @@
  * Redraw the textarea
  */
 void MultilineTextarea::draw(RenderTarget& dst) {
-	if (pic_background_) {
-		dst.tile(Recti(0, 0, get_inner_w(), get_inner_h()), pic_background_, Vector2i::zero());
-	}
 	if (use_old_renderer_) {
 		rt.draw(dst, Vector2i(RICHTEXT_MARGIN, RICHTEXT_MARGIN - scrollbar_.get_scrollpos()));
 	} else {
@@ -175,9 +171,6 @@
 	scrollbar_.set_scrollpos(0);
 }
 
-void MultilineTextarea::set_background(const Image* background) {
-	pic_background_ = background;
-}
 void MultilineTextarea::set_scrollmode(MultilineTextarea::ScrollMode scroll_mode) {
 	scrollmode_ = scroll_mode;
 	scrollbar_.set_force_draw(scrollmode_ == ScrollMode::kScrollNormalForced ||

=== modified file 'src/ui_basic/multilinetextarea.h'
--- src/ui_basic/multilinetextarea.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/multilinetextarea.h	2018-05-12 13:15:45 +0000
@@ -51,9 +51,9 @@
 	   const int32_t y,
 	   const uint32_t w,
 	   const uint32_t h,
+	   UI::PanelStyle style,
 	   const std::string& text = std::string(),
 	   const Align = UI::Align::kLeft,
-	   const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
 	   MultilineTextarea::ScrollMode scroll_mode = MultilineTextarea::ScrollMode::kScrollNormal);
 
 	const std::string& get_text() const {
@@ -87,7 +87,6 @@
 	bool handle_key(bool down, SDL_Keysym code) override;
 	void scroll_to_top();
 
-	void set_background(const Image* background);
 	void set_scrollmode(MultilineTextarea::ScrollMode scroll_mode);
 
 protected:
@@ -113,8 +112,6 @@
 
 	Scrollbar scrollbar_;
 	ScrollMode scrollmode_;
-
-	const Image* pic_background_;
 };
 }
 

=== modified file 'src/ui_basic/panel.cc'
--- src/ui_basic/panel.cc	2018-05-03 18:52:48 +0000
+++ src/ui_basic/panel.cc	2018-05-12 13:15:45 +0000
@@ -440,6 +440,22 @@
 }
 
 /**
+ * Draw texture and color from the info if they have been specified.
+ */
+void Panel::draw_background(RenderTarget& dst, const UI::PanelStyleInfo& info) {
+	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) {
+		dst.fill_rect(rect, RGBAColor(0, 0, 0, 255));
+		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);
+	}
+}
+
+/**
  * Called once per event loop pass, unless set_think(false) has
  * been called. It is intended to be used for animations and game logic.
  */

=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/panel.h	2018-05-12 13:15:45 +0000
@@ -32,6 +32,7 @@
 #include "base/vector.h"
 #include "graphic/align.h"
 #include "graphic/font_handler1.h"
+#include "graphic/panel_styles.h"
 
 class RenderTarget;
 class Image;
@@ -311,6 +312,8 @@
 	static void play_new_chat_message();
 
 	static bool draw_tooltip(RenderTarget&, const std::string& text);
+	void draw_background(RenderTarget& dst, const UI::PanelStyleInfo&);
+	void draw_background(RenderTarget& dst, Recti rect, const UI::PanelStyleInfo&);
 
 	static const Image* default_cursor_;
 	static const Image* default_cursor_click_;

=== modified file 'src/ui_basic/scrollbar.cc'
--- src/ui_basic/scrollbar.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/scrollbar.cc	2018-05-12 13:15:45 +0000
@@ -23,6 +23,7 @@
 
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/style_manager.h"
 #include "ui_basic/mouse_constants.h"
 
 namespace UI {
@@ -43,7 +44,7 @@
                      int32_t const y,
                      uint32_t const w,
                      uint32_t const h,
-                     const Image* button_background,
+                     UI::PanelStyle style,
                      bool const horiz)
    : Panel(parent, x, y, w, h),
      horizontal_(horiz),
@@ -60,7 +61,7 @@
                                            "images/ui_basic/scrollbar_up.png")),
      pic_plus_(g_gr->images().get(horiz ? "images/ui_basic/scrollbar_right.png" :
                                           "images/ui_basic/scrollbar_down.png")),
-     pic_buttons_(button_background) {
+     button_style_(g_gr->styles().scrollbar_style(style)) {
 	set_thinks(true);
 	layout();
 }
@@ -233,7 +234,7 @@
 }
 
 void Scrollbar::draw_button(RenderTarget& dst, Area area, const Recti& r) {
-	dst.tile(r.cast<int>(), pic_buttons_, Vector2i(get_x(), get_y()));
+	draw_background(dst, r.cast<int>(), *button_style_);
 
 	// Draw the picture
 	const Image* pic = nullptr;

=== modified file 'src/ui_basic/scrollbar.h'
--- src/ui_basic/scrollbar.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/scrollbar.h	2018-05-12 13:15:45 +0000
@@ -23,7 +23,6 @@
 #include <boost/signals2.hpp>
 
 #include "base/rect.h"
-#include "graphic/graphic.h"
 #include "ui_basic/panel.h"
 
 namespace UI {
@@ -43,7 +42,7 @@
 	          int32_t y,
 	          uint32_t w,
 	          uint32_t h,
-	          const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	          UI::PanelStyle style,
 	          bool horiz = false);
 
 	boost::signals2::signal<void(int32_t)> moved;
@@ -92,7 +91,6 @@
 	bool
 	handle_mousemove(uint8_t state, int32_t mx, int32_t my, int32_t xdiff, int32_t ydiff) override;
 
-private:
 	bool horizontal_;
 	bool force_draw_;  // draw this scrollbar, even if it can't do anything
 
@@ -106,9 +104,9 @@
 	uint32_t time_nextact_;
 	int32_t knob_grabdelta_;  ///< only while pressed_ == Knob
 
-	const Image* pic_minus_;  ///< left/up
-	const Image* pic_plus_;   ///< right/down
-	const Image* pic_buttons_;
+	const Image* pic_minus_;                  ///< left/up
+	const Image* pic_plus_;                   ///< right/down
+	const UI::PanelStyleInfo* button_style_;  // Background color and texture. Not owned.
 };
 }
 

=== modified file 'src/ui_basic/slider.cc'
--- src/ui_basic/slider.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/slider.cc	2018-05-12 13:15:45 +0000
@@ -21,7 +21,9 @@
 #include <cmath>
 
 #include "graphic/font_handler1.h"
+#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/style_manager.h"
 #include "graphic/text_layout.h"
 #include "ui_basic/mouse_constants.h"
 
@@ -55,7 +57,7 @@
                const int32_t min_value,
                const int32_t max_value,
                const int32_t value,
-               const Image* background_picture_id,
+               SliderStyle style,
                const std::string& tooltip_text,
                const uint32_t cursor_size,
                const bool enabled,
@@ -70,7 +72,7 @@
      highlighted_(false),
      pressed_(false),
      enabled_(enabled),
-     pic_background_(background_picture_id),
+     cursor_style_(g_gr->styles().slider_style(style)),
      x_gap_(x_gap),
      y_gap_(y_gap),
      bar_size_(bar_size),
@@ -148,12 +150,13 @@
    RenderTarget& dst, int32_t const x, int32_t const y, int32_t const w, int32_t const h) {
 
 	RGBColor black(0, 0, 0);
-
-	dst.tile  //  background
-	   (Recti(Vector2i(x, y), w, h), pic_background_, Vector2i(get_x(), get_y()));
-
-	if (highlighted_)
-		dst.brighten_rect(Recti(x, y, w, h), MOUSE_OVER_BRIGHT_FACTOR);
+	const Recti background_rect(x, y, w, h);
+
+	draw_background(dst, background_rect, *cursor_style_);
+
+	if (highlighted_) {
+		dst.brighten_rect(background_rect, MOUSE_OVER_BRIGHT_FACTOR);
+	}
 
 	if (pressed_) {       //  draw border
 		dst.brighten_rect  //  bottom edge
@@ -487,7 +490,7 @@
                                const uint32_t h,
                                const std::vector<std::string>& labels_in,
                                uint32_t value_,
-                               const Image* background_picture_id,
+                               SliderStyle style,
                                const std::string& tooltip_text,
                                const uint32_t cursor_size,
                                const bool enabled)
@@ -501,7 +504,7 @@
             0,
             labels_in.size() - 1,
             value_,
-            background_picture_id,
+            style,
             tooltip_text,
             cursor_size,
             enabled),

=== modified file 'src/ui_basic/slider.h'
--- src/ui_basic/slider.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/slider.h	2018-05-12 13:15:45 +0000
@@ -48,7 +48,7 @@
 	       int32_t min_value,
 	       int32_t max_value,
 	       int32_t value,
-	       const Image* background_picture_id,
+	       UI::SliderStyle style,
 	       const std::string& tooltip_text,
 	       uint32_t cursor_size,
 	       bool enabled,
@@ -118,7 +118,7 @@
 	bool pressed_;      //  the cursor is pressed
 	bool enabled_;      //  enabled widget
 
-	const Image* pic_background_;  //  background texture (picture ID)
+	const UI::PanelStyleInfo* cursor_style_;  // Cursor color and texture. Not owned.
 
 protected:
 	int32_t x_gap_;  //  draw positions
@@ -141,7 +141,7 @@
 	                 const int32_t min_value,
 	                 const int32_t max_value,
 	                 const int32_t value,
-	                 const Image* background_picture_id,
+	                 UI::SliderStyle style,
 	                 const std::string& tooltip_text = std::string(),
 	                 const uint32_t cursor_size = 20,
 	                 const bool enabled = true)
@@ -153,7 +153,7 @@
 	            min_value,
 	            max_value,
 	            value,
-	            background_picture_id,
+	            style,
 	            tooltip_text,
 	            cursor_size,
 	            enabled,
@@ -181,7 +181,7 @@
 	               const int32_t min_value,
 	               const int32_t max_value,
 	               const int32_t value,
-	               const Image* background_picture_id,
+	               UI::SliderStyle style,
 	               const uint32_t cursor_size = 20,
 	               const std::string& tooltip_text = std::string(),
 	               const bool enabled = true)
@@ -193,7 +193,7 @@
 	            min_value,
 	            max_value,
 	            value,
-	            background_picture_id,
+	            style,
 	            tooltip_text,
 	            cursor_size,
 	            enabled,
@@ -221,7 +221,7 @@
 	               const uint32_t h,
 	               const std::vector<std::string>& labels_in,
 	               uint32_t value_,
-	               const Image* background_picture_id,
+	               UI::SliderStyle style,
 	               const std::string& tooltip_text = std::string(),
 	               const uint32_t cursor_size = 20,
 	               const bool enabled = true);

=== modified file 'src/ui_basic/spinbox.cc'
--- src/ui_basic/spinbox.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/spinbox.cc	2018-05-12 13:15:45 +0000
@@ -29,6 +29,7 @@
 #include "base/macros.h"
 #include "base/wexception.h"
 #include "graphic/font_handler1.h"
+#include "graphic/graphic.h"
 #include "graphic/text/font_set.h"
 #include "graphic/text_constants.h"
 #include "ui_basic/button.h"
@@ -52,7 +53,7 @@
 	UI::SpinBox::Units unit;
 
 	/// Background tile style of buttons.
-	const Image* background;
+	UI::ButtonStyle button_style;
 
 	/// Special names for specific values
 	std::map<int32_t, std::string> value_replacements;
@@ -83,9 +84,9 @@
                  int32_t const startval,
                  int32_t const minval,
                  int32_t const maxval,
+                 UI::PanelStyle style,
                  const std::string& label_text,
                  const SpinBox::Units& unit,
-                 const Image* button_background,
                  SpinBox::Type type,
                  int32_t step_size,
                  int32_t big_step_size)
@@ -105,13 +106,13 @@
 	}
 	sbi_->value = startval;
 	sbi_->unit = unit;
-	sbi_->background = button_background;
+	sbi_->button_style = style == UI::PanelStyle::kFsMenu ? UI::ButtonStyle::kFsMenuMenu :
+	                                                        UI::ButtonStyle::kWuiSecondary;
 
 	box_ = new UI::Box(this, 0, 0, UI::Box::Horizontal, 0, 0, padding_);
 
-	sbi_->label =
-	   new UI::MultilineTextarea(box_, 0, 0, 0, 0, label_text, UI::Align::kLeft, button_background,
-	                             UI::MultilineTextarea::ScrollMode::kNoScrolling);
+	sbi_->label = new UI::MultilineTextarea(box_, 0, 0, 0, 0, style, label_text, UI::Align::kLeft,
+	                                        UI::MultilineTextarea::ScrollMode::kNoScrolling);
 	box_->add(sbi_->label);
 
 	sbi_->text = new UI::Textarea(box_, "", UI::Align::kCenter);
@@ -119,23 +120,23 @@
 	bool is_big = type_ == SpinBox::Type::kBig;
 
 	sbi_->button_minus =
-	   new Button(box_, "-", 0, 0, button_height_, button_height_, sbi_->background,
+	   new Button(box_, "-", 0, 0, button_height_, button_height_, sbi_->button_style,
 	              g_gr->images().get(is_big ? "images/ui_basic/scrollbar_left.png" :
 	                                          "images/ui_basic/scrollbar_down.png"),
 	              _("Decrease the value"));
 	sbi_->button_plus =
-	   new Button(box_, "+", 0, 0, button_height_, button_height_, sbi_->background,
+	   new Button(box_, "+", 0, 0, button_height_, button_height_, sbi_->button_style,
 	              g_gr->images().get(is_big ? "images/ui_basic/scrollbar_right.png" :
 	                                          "images/ui_basic/scrollbar_up.png"),
 	              _("Increase the value"));
 
 	if (is_big) {
 		sbi_->button_ten_minus =
-		   new Button(box_, "--", 0, 0, 2 * button_height_, button_height_, sbi_->background,
+		   new Button(box_, "--", 0, 0, 2 * button_height_, button_height_, sbi_->button_style,
 		              g_gr->images().get("images/ui_basic/scrollbar_left_fast.png"),
 		              _("Decrease the value by 10"));
 		sbi_->button_ten_plus =
-		   new Button(box_, "++", 0, 0, 2 * button_height_, button_height_, sbi_->background,
+		   new Button(box_, "++", 0, 0, 2 * button_height_, button_height_, sbi_->button_style,
 		              g_gr->images().get("images/ui_basic/scrollbar_right_fast.png"),
 		              _("Increase the value by 10"));
 

=== modified file 'src/ui_basic/spinbox.h'
--- src/ui_basic/spinbox.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/spinbox.h	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 #include <boost/signals2.hpp>
 
 #include "graphic/align.h"
-#include "graphic/graphic.h"
 #include "ui_basic/box.h"
 #include "ui_basic/button.h"
 
@@ -59,9 +58,9 @@
 	        int32_t startval,
 	        int32_t minval,
 	        int32_t maxval,
+	        UI::PanelStyle style,
 	        const std::string& label_text = std::string(),
 	        const Units& unit = Units::kNone,
-	        const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
 	        SpinBox::Type = SpinBox::Type::kSmall,
 	        // The amount by which units are increased/decreased for small and big steps when a
 	        // button is pressed.

=== modified file 'src/ui_basic/table.cc'
--- src/ui_basic/table.cc	2018-05-02 07:02:18 +0000
+++ src/ui_basic/table.cc	2018-05-12 13:15:45 +0000
@@ -22,14 +22,12 @@
 #include <boost/bind.hpp>
 
 #include "graphic/font_handler1.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/button.h"
 #include "ui_basic/mouse_constants.h"
 #include "ui_basic/scrollbar.h"
 
@@ -47,16 +45,17 @@
                     int32_t y,
                     uint32_t w,
                     uint32_t h,
-                    const Image* button_background,
+                    PanelStyle style,
                     TableRows rowtype)
    : Panel(parent, x, y, w, h),
      total_width_(0),
      headerheight_(text_height() + 4),
      lineheight_(text_height()),
-     button_background_(button_background),
+     button_style_(style == UI::PanelStyle::kFsMenu ? UI::ButtonStyle::kFsMenuMenu :
+                                                      UI::ButtonStyle::kWuiSecondary),
      scrollbar_(nullptr),
      scrollbar_filler_button_(
-        new Button(this, "", 0, 0, Scrollbar::kSize, headerheight_, button_background, "")),
+        new Button(this, "", 0, 0, Scrollbar::kSize, headerheight_, button_style_, "")),
      scrollpos_(0),
      selection_(no_selection_index()),
      last_multiselect_(no_selection_index()),
@@ -71,7 +70,7 @@
 	set_can_focus(true);
 	scrollbar_filler_button_->set_visible(false);
 	scrollbar_ = new Scrollbar(this, get_w() - Scrollbar::kSize, headerheight_, Scrollbar::kSize,
-	                           get_h() - headerheight_, button_background);
+	                           get_h() - headerheight_, style);
 	scrollbar_->moved.connect(boost::bind(&Table::set_scrollpos, this, _1));
 	scrollbar_->set_steps(1);
 	scrollbar_->set_singlestepsize(lineheight_);
@@ -113,8 +112,8 @@
 		Column c;
 		// All columns have a title button that is clickable for sorting.
 		// The title text can be empty.
-		c.btn = new Button(this, title, complete_width, 0, width, headerheight_, button_background_,
-		                   title, tooltip_string);
+		c.btn = new Button(this, title, complete_width, 0, width, headerheight_, button_style_, title,
+		                   tooltip_string);
 		c.btn->sigclicked.connect(
 		   boost::bind(&Table::header_button_clicked, boost::ref(*this), columns_.size()));
 		c.width = width;

=== modified file 'src/ui_basic/table.h'
--- src/ui_basic/table.h	2018-05-02 07:02:18 +0000
+++ src/ui_basic/table.h	2018-05-12 13:15:45 +0000
@@ -29,7 +29,7 @@
 
 #include "graphic/align.h"
 #include "graphic/color.h"
-#include "graphic/graphic.h"
+#include "ui_basic/button.h"
 #include "ui_basic/panel.h"
 
 namespace UI {
@@ -58,7 +58,7 @@
 	      int32_t y,
 	      uint32_t w,
 	      uint32_t h,
-	      const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	      UI::PanelStyle style,
 	      TableRows rowtype = TableRows::kSingle);
 	~Table();
 
@@ -168,7 +168,7 @@
 	      int32_t y,
 	      uint32_t w,
 	      uint32_t h,
-	      const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	      UI::PanelStyle style,
 	      TableRows rowtype = TableRows::kSingle);
 	~Table() override;
 
@@ -303,7 +303,7 @@
 	int total_width_;
 	const uint32_t headerheight_;
 	int32_t lineheight_;
-	const Image* button_background_;
+	UI::ButtonStyle button_style_;
 	Scrollbar* scrollbar_;
 	// A disabled button that will fill the space above the scroll bar
 	UI::Button* scrollbar_filler_button_;
@@ -334,9 +334,9 @@
 	      int32_t y,
 	      uint32_t w,
 	      uint32_t h,
-	      const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	      UI::PanelStyle style,
 	      TableRows rowtype = TableRows::kSingle)
-	   : Base(parent, x, y, w, h, button_background, rowtype) {
+	   : Base(parent, x, y, w, h, style, rowtype) {
 	}
 
 	void remove_entry(Entry const* const entry) {
@@ -368,9 +368,9 @@
 	      int32_t y,
 	      uint32_t w,
 	      uint32_t h,
-	      const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	      UI::PanelStyle style,
 	      TableRows rowtype = TableRows::kSingle)
-	   : Base(parent, x, y, w, h, button_background, rowtype) {
+	   : Base(parent, x, y, w, h, style, rowtype) {
 	}
 
 	void remove_entry(Entry const* entry) {
@@ -402,9 +402,9 @@
 	      int32_t y,
 	      uint32_t w,
 	      uint32_t h,
-	      const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	      UI::PanelStyle style,
 	      TableRows rowtype = TableRows::kSingle)
-	   : Base(parent, x, y, w, h, button_background, rowtype) {
+	   : Base(parent, x, y, w, h, style, rowtype) {
 	}
 
 	void remove_entry(const Entry& entry) {
@@ -440,9 +440,9 @@
 	      int32_t y,
 	      uint32_t w,
 	      uint32_t h,
-	      const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	      UI::PanelStyle style,
 	      TableRows rowtype = TableRows::kSingle)
-	   : Base(parent, x, y, w, h, button_background, rowtype) {
+	   : Base(parent, x, y, w, h, style, rowtype) {
 	}
 
 	void remove_entry(Entry& entry) {
@@ -480,9 +480,9 @@
 	      int32_t y,
 	      uint32_t w,
 	      uint32_t h,
-	      const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	      UI::PanelStyle style,
 	      TableRows rowtype = TableRows::kSingle)
-	   : Base(parent, x, y, w, h, button_background, rowtype) {
+	   : Base(parent, x, y, w, h, style, rowtype) {
 	}
 
 	void remove_entry(uintptr_t const entry) {
@@ -516,9 +516,9 @@
 	      int32_t y,
 	      uint32_t w,
 	      uint32_t h,
-	      const Image* button_background = g_gr->images().get("images/ui_basic/but3.png"),
+	      UI::PanelStyle style,
 	      TableRows rowtype = TableRows::kSingle)
-	   : Base(parent, x, y, w, h, button_background, rowtype) {
+	   : Base(parent, x, y, w, h, style, rowtype) {
 	}
 };
 }

=== modified file 'src/ui_basic/tabpanel.cc'
--- src/ui_basic/tabpanel.cc	2018-04-09 06:11:31 +0000
+++ src/ui_basic/tabpanel.cc	2018-05-12 13:15:45 +0000
@@ -20,7 +20,9 @@
 #include "ui_basic/tabpanel.h"
 
 #include "graphic/font_handler1.h"
+#include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/style_manager.h"
 #include "graphic/text_layout.h"
 #include "ui_basic/mouse_constants.h"
 
@@ -90,12 +92,16 @@
  * Initialize an empty TabPanel. We use width == 0 as an indicator that the size hasn't been set
  * yet.
 */
-TabPanel::TabPanel(Panel* const parent, const Image* background, TabPanel::Type border_type)
-   : Panel(parent, 0, 0, 0, 0),
-     border_type_(border_type),
+TabPanel::TabPanel(Panel* const parent, UI::TabPanelStyle style)
+   : Panel(parent,
+           0,
+           0,
+           0,
+           0),
+     style_(style),
      active_(0),
      highlight_(kNotFound),
-     pic_background_(background) {
+     background_style_(g_gr->styles().tabpanel_style(style)) {
 }
 
 /**
@@ -113,7 +119,7 @@
 		// avoid excessive craziness in case there is a wraparound
 		h = std::min(h, h - (kTabPanelButtonHeight + kTabPanelSeparatorHeight));
 		// If we have a border, we will also want some margin to the bottom
-		if (border_type_ == TabPanel::Type::kBorder) {
+		if (style_ == UI::TabPanelStyle::kFsMenu) {
 			h -= kTabPanelSeparatorHeight;
 		}
 		panel->set_size(get_w(), h);
@@ -182,7 +188,7 @@
 	tabs_.push_back(new Tab(this, id, x, name, title, pic, tooltip_text, panel));
 
 	// Add a margin if there is a border
-	if (border_type_ == TabPanel::Type::kBorder) {
+	if (style_ == UI::TabPanelStyle::kFsMenu) {
 		panel->set_border(kTabPanelSeparatorHeight + 1, kTabPanelSeparatorHeight + 1,
 		                  kTabPanelSeparatorHeight, kTabPanelSeparatorHeight);
 		panel->set_pos(Vector2i(0, kTabPanelButtonHeight));
@@ -248,22 +254,19 @@
 		return;
 	}
 
-	// draw the background
+	// Draw the background
 	static_assert(2 < kTabPanelButtonHeight, "assert(2 < kTabPanelButtonSize) failed.");
 	static_assert(4 < kTabPanelButtonHeight, "assert(4 < kTabPanelButtonSize) failed.");
-
-	if (pic_background_) {
-		if (!tabs_.empty()) {
-			dst.tile(Recti(Vector2i::zero(), tabs_.back()->get_x() + tabs_.back()->get_w(),
-			               kTabPanelButtonHeight - 2),
-			         pic_background_, Vector2i(get_x(), get_y()));
-		}
-		assert(kTabPanelButtonHeight - 2 <= get_h());
-		dst.tile(Recti(Vector2i(0, kTabPanelButtonHeight - 2), get_w(),
-		               get_h() - kTabPanelButtonHeight + 2),
-		         pic_background_, Vector2i(get_x(), get_y() + kTabPanelButtonHeight - 2));
-	}
-
+	assert(kTabPanelButtonHeight - 2 <= get_h());
+
+	draw_background(
+	   dst, Recti(0, 0, tabs_.back()->get_x() + tabs_.back()->get_w(), kTabPanelButtonHeight - 2),
+	   *background_style_);
+	draw_background(
+	   dst, Recti(0, kTabPanelButtonHeight - 2, get_w(), get_h() - kTabPanelButtonHeight + 2),
+	   *background_style_);
+
+	// Draw the buttons
 	RGBColor black(0, 0, 0);
 
 	// draw the buttons
@@ -324,7 +327,7 @@
 	                  2 * BUTTON_EDGE_BRIGHT_FACTOR);
 
 	// Draw border around the main panel
-	if (border_type_ == TabPanel::Type::kBorder) {
+	if (style_ == UI::TabPanelStyle::kFsMenu) {
 		//  left edge
 		dst.brighten_rect(Recti(0, kTabPanelButtonHeight, 2, get_h() - 2), BUTTON_EDGE_BRIGHT_FACTOR);
 		//  bottom edge

=== modified file 'src/ui_basic/tabpanel.h'
--- src/ui_basic/tabpanel.h	2018-04-07 16:59:00 +0000
+++ src/ui_basic/tabpanel.h	2018-05-12 13:15:45 +0000
@@ -86,13 +86,10 @@
  *
  */
 struct TabPanel : public Panel {
-	enum class Type { kNoBorder, kBorder };
 
 	friend struct Tab;
 
-	TabPanel(Panel* parent,
-	         const Image* background,
-	         TabPanel::Type border_type = TabPanel::Type::kNoBorder);
+	TabPanel(Panel* parent, UI::TabPanelStyle style);
 
 	/** Add textual tab
 	 *
@@ -129,7 +126,7 @@
 	void layout() override;
 	void update_desired_size() override;
 
-	TabPanel::Type border_type_;  ///< whether there will be a border around the panels.
+	UI::TabPanelStyle style_;
 
 private:
 	// Common adding function for textual and pictorial tabs
@@ -153,7 +150,7 @@
 	size_t active_;     ///< index of the currently active tab
 	size_t highlight_;  ///< index of the highlighted button
 
-	const Image* pic_background_;  ///< picture used to draw background
+	const UI::PanelStyleInfo* background_style_;  // Background color and texture. Not owned.
 };
 }
 

=== modified file 'src/ui_basic/window.cc'
--- src/ui_basic/window.cc	2018-04-07 16:59:00 +0000
+++ src/ui_basic/window.cc	2018-05-12 13:15:45 +0000
@@ -25,6 +25,7 @@
 #include "graphic/font_handler1.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
+#include "graphic/style_manager.h"
 #include "graphic/text_layout.h"
 
 namespace UI {
@@ -87,11 +88,11 @@
      drag_start_win_y_(0),
      drag_start_mouse_x_(0),
      drag_start_mouse_y_(0),
-     pic_lborder_(g_gr->images().get("images/wui/window_left.png")),
-     pic_rborder_(g_gr->images().get("images/wui/window_right.png")),
-     pic_top_(g_gr->images().get("images/wui/window_top.png")),
-     pic_bottom_(g_gr->images().get("images/wui/window_bottom.png")),
-     pic_background_(g_gr->images().get("images/wui/window_background.png")),
+     pic_lborder_(g_gr->images().get(kTemplateDir + "wui/left.png")),
+     pic_rborder_(g_gr->images().get(kTemplateDir + "wui/right.png")),
+     pic_top_(g_gr->images().get(kTemplateDir + "wui/top.png")),
+     pic_bottom_(g_gr->images().get(kTemplateDir + "wui/bottom.png")),
+     pic_background_(g_gr->images().get(kTemplateDir + "wui/background.png")),
      center_panel_(nullptr),
      fastclick_panel_(nullptr) {
 	set_title(title);

=== modified file 'src/ui_fsmenu/CMakeLists.txt'
--- src/ui_fsmenu/CMakeLists.txt	2017-12-02 12:43:38 +0000
+++ src/ui_fsmenu/CMakeLists.txt	2018-05-12 13:15:45 +0000
@@ -52,7 +52,6 @@
   DEPENDS
     base_i18n
     build_info
-    graphic
     ui_basic
     ui_fsmenu_main_menu
 )
@@ -76,7 +75,6 @@
     singleplayer.h
   DEPENDS
     base_i18n
-    graphic
     graphic_text_constants
     io_filesystem
     profile
@@ -180,7 +178,6 @@
     intro.h
   DEPENDS
     base_i18n
-    graphic
     ui_basic
     ui_fsmenu_base
 )

=== modified file 'src/ui_fsmenu/about.cc'
--- src/ui_fsmenu/about.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/about.cc	2018-05-12 13:15:45 +0000
@@ -22,13 +22,12 @@
 #include <boost/format.hpp>
 
 #include "base/i18n.h"
-#include "graphic/graphic.h"
 
 FullscreenMenuAbout::FullscreenMenuAbout()
    : FullscreenMenuBase(),
      title_(this, 0, 0, _("About Widelands"), UI::Align::kCenter),
-     close_(this, "close", 0, 0, 0, 0, g_gr->images().get("images/ui_basic/but2.png"), _("Close")),
-     tabs_(this, g_gr->images().get("images/ui_basic/but1.png"), UI::TabPanel::Type::kBorder) {
+     close_(this, "close", 0, 0, 0, 0, UI::ButtonStyle::kFsMenuPrimary, _("Close")),
+     tabs_(this, UI::PanelStyle::kFsMenu, UI::TabPanelStyle::kFsMenu) {
 	title_.set_fontsize(UI_FONT_SIZE_BIG);
 	tabs_.add_tab("txts/README.lua");
 	tabs_.add_tab("txts/LICENSE.lua");

=== modified file 'src/ui_fsmenu/campaign_select.cc'
--- src/ui_fsmenu/campaign_select.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/campaign_select.cc	2018-05-12 13:15:45 +0000
@@ -42,7 +42,7 @@
  */
 FullscreenMenuCampaignSelect::FullscreenMenuCampaignSelect()
    : FullscreenMenuLoadMapOrGame(),
-     table_(this, tablex_, tabley_, tablew_, tableh_),
+     table_(this, tablex_, tabley_, tablew_, tableh_, UI::PanelStyle::kFsMenu),
 
      // Main Title
      title_(this, get_w() / 2, tabley_ / 3, _("Choose a campaign"), UI::Align::kCenter),
@@ -53,21 +53,24 @@
                   right_column_x_ + indent_,
                   get_y_from_preceding(label_campname_) + padding_,
                   get_right_column_w(right_column_x_) - indent_,
-                  label_height_),
+                  label_height_,
+                  UI::PanelStyle::kFsMenu),
 
      label_tribename_(this, right_column_x_, get_y_from_preceding(ta_campname_) + 2 * padding_),
      ta_tribename_(this,
                    right_column_x_ + indent_,
                    get_y_from_preceding(label_tribename_) + padding_,
                    get_right_column_w(right_column_x_ + indent_),
-                   label_height_),
+                   label_height_,
+                   UI::PanelStyle::kFsMenu),
 
      label_difficulty_(this, right_column_x_, get_y_from_preceding(ta_tribename_) + 2 * padding_),
      ta_difficulty_(this,
                     right_column_x_ + indent_,
                     get_y_from_preceding(label_difficulty_) + padding_,
                     get_right_column_w(right_column_x_ + indent_),
-                    2 * label_height_ - padding_),
+                    2 * label_height_ - padding_,
+                    UI::PanelStyle::kFsMenu),
 
      label_description_(this,
                         right_column_x_,
@@ -77,7 +80,8 @@
                      right_column_x_ + indent_,
                      get_y_from_preceding(label_description_) + padding_,
                      get_right_column_w(right_column_x_ + indent_),
-                     buty_ - get_y_from_preceding(label_description_) - 4 * padding_) {
+                     buty_ - get_y_from_preceding(label_description_) - 4 * padding_,
+                     UI::PanelStyle::kFsMenu) {
 	title_.set_fontsize(UI_FONT_SIZE_BIG);
 	back_.set_tooltip(_("Return to the main menu"));
 	ok_.set_tooltip(_("Play this campaign"));
@@ -265,7 +269,7 @@
  */
 FullscreenMenuCampaignMapSelect::FullscreenMenuCampaignMapSelect(bool is_tutorial)
    : FullscreenMenuLoadMapOrGame(),
-     table_(this, tablex_, tabley_, tablew_, tableh_),
+     table_(this, tablex_, tabley_, tablew_, tableh_, UI::PanelStyle::kFsMenu),
 
      // Main title
      title_(this,
@@ -278,6 +282,7 @@
                get_y_from_preceding(title_) + 6 * padding_,
                get_w() * 2 / 3,
                4 * label_height_,
+               UI::PanelStyle::kFsMenu,
                "",
                UI::Align::kCenter),
 
@@ -287,21 +292,24 @@
                  right_column_x_ + indent_,
                  get_y_from_preceding(label_mapname_) + padding_,
                  get_right_column_w(right_column_x_ + indent_),
-                 label_height_),
+                 label_height_,
+                 UI::PanelStyle::kFsMenu),
 
      label_author_(this, right_column_x_, get_y_from_preceding(ta_mapname_) + 2 * padding_),
      ta_author_(this,
                 right_column_x_ + indent_,
                 get_y_from_preceding(label_author_) + padding_,
                 get_right_column_w(right_column_x_ + indent_),
-                2 * label_height_),
+                2 * label_height_,
+                UI::PanelStyle::kFsMenu),
 
      label_description_(this, right_column_x_, get_y_from_preceding(ta_author_) + padding_),
      ta_description_(this,
                      right_column_x_ + indent_,
                      get_y_from_preceding(label_description_) + padding_,
                      get_right_column_w(right_column_x_ + indent_),
-                     buty_ - get_y_from_preceding(label_description_) - 4 * padding_),
+                     buty_ - get_y_from_preceding(label_description_) - 4 * padding_,
+                     UI::PanelStyle::kFsMenu),
 
      is_tutorial_(is_tutorial) {
 	title_.set_fontsize(UI_FONT_SIZE_BIG);

=== modified file 'src/ui_fsmenu/helpwindow.cc'
--- src/ui_fsmenu/helpwindow.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/helpwindow.cc	2018-05-12 13:15:45 +0000
@@ -40,15 +40,15 @@
                                            uint32_t height)
    : Window(
         parent, "help_window", 0, 0, width, height, (boost::format(_("Help: %s")) % caption).str()),
-     textarea_(new MultilineTextarea(this, 5, 5, width - 10, height - 30)) {
+     textarea_(new MultilineTextarea(this, 5, 5, width - 10, height - 30, UI::PanelStyle::kWui)) {
 	int margin = 5;
 
 	// Calculate sizes
 	width = (width == 0) ? g_gr->get_xres() * 3 / 5 : width;
 	height = (height == 0) ? g_gr->get_yres() * 4 / 5 : height;
 
-	Button* btn = new Button(this, "ok", width / 3, 0, width / 3, 0,
-	                         g_gr->images().get("images/ui_basic/but5.png"), _("OK"));
+	Button* btn =
+	   new Button(this, "ok", width / 3, 0, width / 3, 0, UI::ButtonStyle::kWuiPrimary, _("OK"));
 
 	btn->sigclicked.connect(boost::bind(&FullscreenHelpWindow::clicked_ok, boost::ref(*this)));
 	btn->set_pos(Vector2i(btn->get_x(), height - margin - btn->get_h()));

=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc	2018-05-02 19:26:52 +0000
+++ src/ui_fsmenu/internet_lobby.cc	2018-05-12 13:15:45 +0000
@@ -71,7 +71,7 @@
                get_h() * 55 / 100,
                butw_,
                buth_,
-               g_gr->images().get("images/ui_basic/but1.png"),
+               UI::ButtonStyle::kFsMenuSecondary,
                _("Join this game")),
      hostgame_(this,
                "host_game",
@@ -79,7 +79,7 @@
                get_h() * 81 / 100,
                butw_,
                buth_,
-               g_gr->images().get("images/ui_basic/but1.png"),
+               UI::ButtonStyle::kFsMenuSecondary,
                _("Open a new game")),
      back_(this,
            "back",
@@ -87,22 +87,18 @@
            get_h() * 90 / 100,
            butw_,
            buth_,
-           g_gr->images().get("images/ui_basic/but0.png"),
+           UI::ButtonStyle::kFsMenuSecondary,
            _("Back")),
 
      // Edit boxes
-     edit_servername_(this,
-                      get_w() * 17 / 25,
-                      get_h() * 68 / 100,
-                      butw_,
-                      buth_,
-                      2,
-                      g_gr->images().get("images/ui_basic/but2.png"),
-                      fs_),
+     edit_servername_(
+        this, get_w() * 17 / 25, get_h() * 68 / 100, butw_, buth_, 2, UI::PanelStyle::kFsMenu, fs_),
 
      // List
-     clientsonline_list_(this, get_w() * 4 / 125, get_h() / 5, lisw_, get_h() * 3 / 10),
-     opengames_list_(this, get_w() * 17 / 25, get_h() / 5, butw_, get_h() * 7 / 20),
+     clientsonline_list_(
+        this, get_w() * 4 / 125, get_h() / 5, lisw_, get_h() * 3 / 10, UI::PanelStyle::kFsMenu),
+     opengames_list_(
+        this, get_w() * 17 / 25, get_h() / 5, butw_, get_h() * 7 / 20, UI::PanelStyle::kFsMenu),
 
      // The chat UI
      chat(this,
@@ -110,7 +106,8 @@
           get_h() * 51 / 100,
           lisw_,
           get_h() * 44 / 100,
-          InternetGaming::ref()),
+          InternetGaming::ref(),
+          UI::PanelStyle::kFsMenu),
 
      // Login information
      nickname_(nick),

=== modified file 'src/ui_fsmenu/launch_game.cc'
--- src/ui_fsmenu/launch_game.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/launch_game.cc	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 #include "base/i18n.h"
 #include "base/warning.h"
 #include "base/wexception.h"
-#include "graphic/graphic.h"
 #include "graphic/text_constants.h"
 #include "logic/game.h"
 #include "logic/game_controller.h"
@@ -53,23 +52,11 @@
                              butw_,
                              get_h() - get_h() * 4 / 10 - buth_,
                              buth_,
-                             ""),
-     ok_(this,
-         "ok",
-         0,
-         0,
-         butw_,
-         buth_,
-         g_gr->images().get("images/ui_basic/but2.png"),
-         _("Start game")),
-     back_(this,
-           "back",
-           0,
-           0,
-           butw_,
-           buth_,
-           g_gr->images().get("images/ui_basic/but0.png"),
-           _("Back")),
+                             "",
+                             UI::DropdownType::kTextual,
+                             UI::PanelStyle::kFsMenu),
+     ok_(this, "ok", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuPrimary, _("Start game")),
+     back_(this, "back", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuSecondary, _("Back")),
      // Text labels
      title_(this, get_w() / 2, get_h() / 25, "", UI::Align::kCenter),
      // Variables and objects used in the menu

=== modified file 'src/ui_fsmenu/launch_game.h'
--- src/ui_fsmenu/launch_game.h	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/launch_game.h	2018-05-12 13:15:45 +0000
@@ -27,7 +27,6 @@
 #include "logic/map.h"
 #include "ui_basic/button.h"
 #include "ui_basic/dropdown.h"
-#include "ui_basic/multilinetextarea.h"
 #include "ui_basic/textarea.h"
 #include "ui_fsmenu/base.h"
 

=== modified file 'src/ui_fsmenu/launch_mpg.cc'
--- src/ui_fsmenu/launch_mpg.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/launch_mpg.cc	2018-05-12 13:15:45 +0000
@@ -59,24 +59,24 @@
 		uint32_t space = y;
 		uint32_t butw = get_inner_w() - 2 * space;
 		uint32_t buth = (get_inner_h() - 2 * space) / 5;
-		UI::Button* btn = new UI::Button(this, "map", space, y, butw, buth,
-		                                 g_gr->images().get("images/ui_basic/but0.png"), _("Map"),
-		                                 _("Select a map"));
+		UI::Button* btn =
+		   new UI::Button(this, "map", space, y, butw, buth, UI::ButtonStyle::kFsMenuSecondary,
+		                  _("Map"), _("Select a map"));
 		btn->sigclicked.connect(boost::bind(&MapOrSaveSelectionWindow::pressedButton,
 		                                    boost::ref(*this),
 		                                    FullscreenMenuBase::MenuTarget::kNormalGame));
 
 		btn = new UI::Button(this, "saved_game", space, y + buth + space, butw, buth,
-		                     g_gr->images().get("images/ui_basic/but0.png"),
+		                     UI::ButtonStyle::kFsMenuSecondary,
 		                     /** Translators: This is a button to select a savegame */
 		                     _("Saved Game"), _("Select a saved game"));
 		btn->sigclicked.connect(boost::bind(&MapOrSaveSelectionWindow::pressedButton,
 		                                    boost::ref(*this),
 		                                    FullscreenMenuBase::MenuTarget::kScenarioGame));
 
-		btn = new UI::Button(this, "cancel", space + butw / 4, y + 3 * buth + 2 * space, butw / 2,
-		                     buth, g_gr->images().get("images/ui_basic/but1.png"), _("Cancel"),
-		                     _("Cancel selection"));
+		btn =
+		   new UI::Button(this, "cancel", space + butw / 4, y + 3 * buth + 2 * space, butw / 2, buth,
+		                  UI::ButtonStyle::kFsMenuSecondary, _("Cancel"), _("Cancel selection"));
 		btn->sigclicked.connect(boost::bind(&MapOrSaveSelectionWindow::pressedButton,
 		                                    boost::ref(*this),
 		                                    FullscreenMenuBase::MenuTarget::kBack));
@@ -114,7 +114,7 @@
                          get_h() * 3 / 20,
                          buth_,
                          buth_,
-                         g_gr->images().get("images/ui_basic/but1.png"),
+                         UI::ButtonStyle::kFsMenuSecondary,
                          g_gr->images().get("images/wui/menus/menu_toggle_minimap.png"),
                          _("Change map or saved game")),
      help_button_(this,
@@ -123,7 +123,7 @@
                   get_h() / 100,
                   buth_,
                   buth_,
-                  g_gr->images().get("images/ui_basic/but1.png"),
+                  UI::ButtonStyle::kFsMenuSecondary,
                   g_gr->images().get("images/ui_basic/menu_help.png"),
                   _("Show the help window")),
 
@@ -151,10 +151,18 @@
                         _("Type of game"),
                         UI::Align::kCenter),
 
-     map_info_(
-        this, right_column_x_, get_h() * 2 / 10, butw_, get_h() * 23 / 80 - 2 * label_height_),
-     client_info_(
-        this, right_column_x_, get_h() * 13 / 20 - 2 * label_height_, butw_, 2 * label_height_),
+     map_info_(this,
+               right_column_x_,
+               get_h() * 2 / 10,
+               butw_,
+               get_h() * 23 / 80 - 2 * label_height_,
+               UI::PanelStyle::kFsMenu),
+     client_info_(this,
+                  right_column_x_,
+                  get_h() * 13 / 20 - 2 * label_height_,
+                  butw_,
+                  2 * label_height_,
+                  UI::PanelStyle::kFsMenu),
      help_(nullptr),
 
      // Variables and objects used in the menu
@@ -215,8 +223,8 @@
  */
 void FullscreenMenuLaunchMPG::set_chat_provider(ChatProvider& chat) {
 	delete chat_;
-	chat_ = new GameChatPanel(
-	   this, get_w() / 50, get_h() * 13 / 20, get_w() * 57 / 80, get_h() * 3 / 10, chat);
+	chat_ = new GameChatPanel(this, get_w() / 50, get_h() * 13 / 20, get_w() * 57 / 80,
+	                          get_h() * 3 / 10, chat, UI::PanelStyle::kFsMenu);
 }
 
 /**

=== modified file 'src/ui_fsmenu/launch_mpg.h'
--- src/ui_fsmenu/launch_mpg.h	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/launch_mpg.h	2018-05-12 13:15:45 +0000
@@ -25,7 +25,6 @@
 
 #include "logic/game_settings.h"
 #include "ui_basic/button.h"
-#include "ui_basic/dropdown.h"
 #include "ui_basic/multilinetextarea.h"
 #include "ui_basic/textarea.h"
 #include "ui_fsmenu/helpwindow.h"

=== modified file 'src/ui_fsmenu/launch_spg.cc'
--- src/ui_fsmenu/launch_spg.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/launch_spg.cc	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 #include "base/i18n.h"
 #include "base/warning.h"
 #include "base/wexception.h"
-#include "graphic/graphic.h"
 #include "graphic/text_constants.h"
 #include "helper.h"
 #include "io/filesystem/layered_filesystem.h"
@@ -52,7 +51,7 @@
                  get_h() * 3 / 10,
                  butw_,
                  buth_,
-                 g_gr->images().get("images/ui_basic/but1.png"),
+                 UI::ButtonStyle::kFsMenuSecondary,
                  _("Select map")),
 
      // Text labels
@@ -106,8 +105,8 @@
 
 		pos_[i] =
 		   new UI::Button(this, "switch_to_position", get_w() / 100, y += buth_, get_h() * 17 / 500,
-		                  get_h() * 17 / 500, g_gr->images().get("images/ui_basic/but1.png"),
-		                  player_image, _("Switch to position"));
+		                  get_h() * 17 / 500, UI::ButtonStyle::kFsMenuSecondary, player_image,
+		                  _("Switch to position"));
 		pos_[i]->sigclicked.connect(
 		   boost::bind(&FullscreenMenuLaunchSPG::switch_to_position, boost::ref(*this), i));
 		players_[i] = new PlayerDescriptionGroup(

=== modified file 'src/ui_fsmenu/launch_spg.h'
--- src/ui_fsmenu/launch_spg.h	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/launch_spg.h	2018-05-12 13:15:45 +0000
@@ -26,8 +26,6 @@
 #include "graphic/playercolor.h"
 #include "logic/map.h"
 #include "ui_basic/button.h"
-#include "ui_basic/dropdown.h"
-#include "ui_basic/multilinetextarea.h"
 #include "ui_basic/textarea.h"
 #include "ui_fsmenu/launch_game.h"
 

=== modified file 'src/ui_fsmenu/load_map_or_game.cc'
--- src/ui_fsmenu/load_map_or_game.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/load_map_or_game.cc	2018-05-12 13:15:45 +0000
@@ -22,10 +22,8 @@
 #include <memory>
 
 #include "base/i18n.h"
-#include "graphic/graphic.h"
 #include "io/filesystem/filesystem.h"
 #include "ui_basic/button.h"
-#include "ui_basic/multilinetextarea.h"
 #include "ui_basic/textarea.h"
 
 /// Select a Map, Saved Game or Replay in Fullscreen Mode.
@@ -34,8 +32,8 @@
 FullscreenMenuLoadMapOrGame::FullscreenMenuLoadMapOrGame()
    : FullscreenMenuBase(),
      // Main buttons
-     back_(this, "back", 0, 0, 0, 0, g_gr->images().get("images/ui_basic/but0.png"), _("Back")),
-     ok_(this, "ok", 0, 0, 0, 0, g_gr->images().get("images/ui_basic/but2.png"), _("OK")) {
+     back_(this, "back", 0, 0, 0, 0, UI::ButtonStyle::kFsMenuSecondary, _("Back")),
+     ok_(this, "ok", 0, 0, 0, 0, UI::ButtonStyle::kFsMenuPrimary, _("OK")) {
 	layout();
 }
 

=== modified file 'src/ui_fsmenu/load_map_or_game.h'
--- src/ui_fsmenu/load_map_or_game.h	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/load_map_or_game.h	2018-05-12 13:15:45 +0000
@@ -27,10 +27,8 @@
 #include <boost/algorithm/string.hpp>
 
 #include "base/i18n.h"
-#include "graphic/graphic.h"
 #include "io/filesystem/filesystem.h"
 #include "ui_basic/button.h"
-#include "ui_basic/multilinetextarea.h"
 #include "ui_basic/table.h"
 #include "ui_basic/textarea.h"
 #include "wui/maptable.h"

=== modified file 'src/ui_fsmenu/loadgame.cc'
--- src/ui_fsmenu/loadgame.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/loadgame.cc	2018-05-12 13:15:45 +0000
@@ -27,7 +27,7 @@
 FullscreenMenuLoadGame::FullscreenMenuLoadGame(Widelands::Game& g,
                                                GameSettingsProvider* gsp,
                                                bool is_replay)
-   : FullscreenMenuLoadMapOrGame(),
+	: FullscreenMenuLoadMapOrGame(),
 
      main_box_(this, 0, 0, UI::Box::Vertical),
      info_box_(&main_box_, 0, 0, UI::Box::Horizontal),
@@ -45,7 +45,7 @@
                       LoadOrSaveGame::FileType::kReplay :
                       (gsp->settings().multiplayer ? LoadOrSaveGame::FileType::kGameMultiPlayer :
                                                      LoadOrSaveGame::FileType::kGameSinglePlayer),
-                   GameDetails::Style::kFsMenu,
+                   UI::PanelStyle::kFsMenu,
                    true),
 
      is_replay_(is_replay) {

=== modified file 'src/ui_fsmenu/main.cc'
--- src/ui_fsmenu/main.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/main.cc	2018-05-12 13:15:45 +0000
@@ -23,7 +23,6 @@
 
 #include "base/i18n.h"
 #include "build_info.h"
-#include "graphic/graphic.h"
 
 FullscreenMenuMain::FullscreenMenuMain()
    : FullscreenMenuMainMenu(),
@@ -35,7 +34,7 @@
                   0,
                   butw_,
                   buth_,
-                  g_gr->images().get(button_background_),
+                  UI::ButtonStyle::kFsMenuMenu,
                   _("Play Tutorial")),
      singleplayer(&vbox_,
                   "single_player",
@@ -43,50 +42,15 @@
                   0,
                   butw_,
                   buth_,
-                  g_gr->images().get(button_background_),
+                  UI::ButtonStyle::kFsMenuMenu,
                   _("Single Player")),
-     multiplayer(&vbox_,
-                 "multi_player",
-                 0,
-                 0,
-                 butw_,
-                 buth_,
-                 g_gr->images().get(button_background_),
-                 _("Multiplayer")),
-     replay(&vbox_,
-            "replay",
-            0,
-            0,
-            butw_,
-            buth_,
-            g_gr->images().get(button_background_),
-            _("Watch Replay")),
-     editor(
-        &vbox_, "editor", 0, 0, butw_, buth_, g_gr->images().get(button_background_), _("Editor")),
-     options(&vbox_,
-             "options",
-             0,
-             0,
-             butw_,
-             buth_,
-             g_gr->images().get(button_background_),
-             _("Options")),
-     about(&vbox_,
-           "about",
-           0,
-           0,
-           butw_,
-           buth_,
-           g_gr->images().get(button_background_),
-           _("About Widelands")),
-     exit(&vbox_,
-          "exit",
-          0,
-          0,
-          butw_,
-          buth_,
-          g_gr->images().get(button_background_),
-          _("Exit Widelands")),
+     multiplayer(
+        &vbox_, "multi_player", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("Multiplayer")),
+     replay(&vbox_, "replay", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("Watch Replay")),
+     editor(&vbox_, "editor", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("Editor")),
+     options(&vbox_, "options", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("Options")),
+     about(&vbox_, "about", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("About Widelands")),
+     exit(&vbox_, "exit", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("Exit Widelands")),
 
      // Textlabels
      version(

=== modified file 'src/ui_fsmenu/main_menu.cc'
--- src/ui_fsmenu/main_menu.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/main_menu.cc	2018-05-12 13:15:45 +0000
@@ -29,7 +29,6 @@
      buth_(get_h() * 9 / 200),
      title_y_(get_h() * 3 / 40),
      padding_(buth_ / 3),
-     button_background_("images/ui_basic//but3.png"),
      vbox_(this, 0, 0, UI::Box::Vertical, 0, 0, padding_) {
 }
 

=== modified file 'src/ui_fsmenu/main_menu.h'
--- src/ui_fsmenu/main_menu.h	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/main_menu.h	2018-05-12 13:15:45 +0000
@@ -40,7 +40,6 @@
 	uint32_t title_y_;
 	uint32_t padding_;
 
-	const std::string button_background_;
 	UI::Box vbox_;
 };
 

=== modified file 'src/ui_fsmenu/mapselect.cc'
--- src/ui_fsmenu/mapselect.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/mapselect.cc	2018-05-12 13:15:45 +0000
@@ -27,7 +27,6 @@
 #include "base/log.h"
 #include "base/wexception.h"
 #include "graphic/font_handler1.h"
-#include "graphic/graphic.h"
 #include "io/filesystem/layered_filesystem.h"
 #include "logic/filesystem_constants.h"
 #include "logic/game_controller.h"
@@ -50,13 +49,13 @@
      // Main title
      title_(this, 0, 0, _("Choose a map"), UI::Align::kCenter),
      checkboxes_(this, 0, 0, UI::Box::Vertical, 0, 0, 2 * padding_),
-     table_(this, tablex_, tabley_, tablew_, tableh_),
+     table_(this, tablex_, tabley_, tablew_, tableh_, UI::PanelStyle::kFsMenu),
      map_details_(this,
                   right_column_x_,
                   tabley_,
                   get_right_column_w(right_column_x_),
                   tableh_ - buth_ - 4 * padding_,
-                  MapDetails::Style::kFsMenu),
+                  UI::PanelStyle::kFsMenu),
 
      scenario_types_(settings->settings().multiplayer ? Map::MP_SCENARIO : Map::SP_SCENARIO),
      basedir_(kMapsDir),

=== modified file 'src/ui_fsmenu/multiplayer.cc'
--- src/ui_fsmenu/multiplayer.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/multiplayer.cc	2018-05-12 13:15:45 +0000
@@ -35,24 +35,11 @@
      title(this, 0, 0, _("Choose game type"), UI::Align::kCenter),
 
      // Buttons
-     metaserver(&vbox_,
-                "metaserver",
-                0,
-                0,
-                butw_,
-                buth_,
-                g_gr->images().get(button_background_),
-                _("Internet game")),
+     metaserver(
+        &vbox_, "metaserver", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("Internet game")),
      showloginbox(nullptr),
-     lan(&vbox_,
-         "lan",
-         0,
-         0,
-         butw_,
-         buth_,
-         g_gr->images().get(button_background_),
-         _("LAN / Direct IP")),
-     back(&vbox_, "back", 0, 0, butw_, buth_, g_gr->images().get(button_background_), _("Back")) {
+     lan(&vbox_, "lan", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("LAN / Direct IP")),
+     back(&vbox_, "back", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("Back")) {
 	metaserver.sigclicked.connect(
 	   boost::bind(&FullscreenMenuMultiPlayer::internet_login, boost::ref(*this)));
 
@@ -74,9 +61,9 @@
 	Section& s = g_options.pull_section("global");
 	auto_log_ = s.get_bool("auto_log", false);
 	if (auto_log_) {
-		showloginbox = new UI::Button(
-		   this, "login_dialog", 0, 0, 0, 0, g_gr->images().get("images/ui_basic/but1.png"),
-		   g_gr->images().get("images/ui_basic/continue.png"), _("Show login dialog"));
+		showloginbox =
+		   new UI::Button(this, "login_dialog", 0, 0, 0, 0, UI::ButtonStyle::kFsMenuSecondary,
+		                  g_gr->images().get("images/ui_basic/continue.png"), _("Show login dialog"));
 		showloginbox->sigclicked.connect(
 		   boost::bind(&FullscreenMenuMultiPlayer::show_internet_login, boost::ref(*this)));
 	}

=== modified file 'src/ui_fsmenu/netsetup_lan.cc'
--- src/ui_fsmenu/netsetup_lan.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/netsetup_lan.cc	2018-05-12 13:15:45 +0000
@@ -50,7 +50,7 @@
               get_h() * 5333 / 10000,
               butw_,
               buth_,
-              g_gr->images().get("images/ui_basic/but1.png"),
+              UI::ButtonStyle::kFsMenuSecondary,
               _("Join this game")),
      hostgame(this,
               "host_game",
@@ -58,7 +58,7 @@
               get_h() * 6083 / 10000,
               butw_,
               buth_,
-              g_gr->images().get("images/ui_basic/but1.png"),
+              UI::ButtonStyle::kFsMenuSecondary,
               _("Host a new game")),
      back(this,
           "back",
@@ -66,7 +66,7 @@
           get_h() * 8333 / 10000,
           butw_,
           buth_,
-          g_gr->images().get("images/ui_basic/but0.png"),
+          UI::ButtonStyle::kFsMenuSecondary,
           _("Back")),
      loadlasthost(this,
                   "load_previous_host",
@@ -74,7 +74,7 @@
                   get_h() * 19 / 40,
                   buth_,
                   buth_,
-                  g_gr->images().get("images/ui_basic/but1.png"),
+                  UI::ButtonStyle::kFsMenuSecondary,
                   g_gr->images().get("images/ui_fsmenu/menu_load_game.png"),
                   _("Load previous host")),
 
@@ -85,7 +85,7 @@
                 butw_,
                 buth_,
                 2,
-                g_gr->images().get("images/ui_basic/but2.png"),
+                UI::PanelStyle::kFsMenu,
                 fs_small()),
      hostname(this,
               get_w() * 16 / 25,
@@ -93,11 +93,16 @@
               get_w() * 17 / 80,
               buth_,
               2,
-              g_gr->images().get("images/ui_basic/but2.png"),
+              UI::PanelStyle::kFsMenu,
               fs_small()),
 
      // List
-     opengames(this, get_w() * 3 / 50, get_h() * 3333 / 10000, listw_, get_h() * 5433 / 10000) {
+     opengames(this,
+               get_w() * 3 / 50,
+               get_h() * 3333 / 10000,
+               listw_,
+               get_h() * 5433 / 10000,
+               UI::PanelStyle::kFsMenu) {
 	joingame.sigclicked.connect(
 	   boost::bind(&FullscreenMenuNetSetupLAN::clicked_joingame, boost::ref(*this)));
 	hostgame.sigclicked.connect(

=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2018-04-23 08:25:10 +0000
+++ src/ui_fsmenu/options.cc	2018-05-12 13:15:45 +0000
@@ -83,26 +83,12 @@
 
      // Buttons
      button_box_(this, 0, 0, UI::Box::Horizontal),
-     cancel_(&button_box_,
-             "cancel",
-             0,
-             0,
-             0,
-             0,
-             g_gr->images().get("images/ui_basic/but0.png"),
-             _("Cancel")),
-     apply_(&button_box_,
-            "apply",
-            0,
-            0,
-            0,
-            0,
-            g_gr->images().get("images/ui_basic/but0.png"),
-            _("Apply")),
-     ok_(&button_box_, "ok", 0, 0, 0, 0, g_gr->images().get("images/ui_basic/but2.png"), _("OK")),
+     cancel_(&button_box_, "cancel", 0, 0, 0, 0, UI::ButtonStyle::kFsMenuSecondary, _("Cancel")),
+     apply_(&button_box_, "apply", 0, 0, 0, 0, UI::ButtonStyle::kFsMenuSecondary, _("Apply")),
+     ok_(&button_box_, "ok", 0, 0, 0, 0, UI::ButtonStyle::kFsMenuPrimary, _("OK")),
 
      // Tabs
-     tabs_(this, g_gr->images().get("images/ui_basic/but1.png"), UI::TabPanel::Type::kBorder),
+     tabs_(this, UI::TabPanelStyle::kFsMenu),
 
      box_interface_(&tabs_, 0, 0, UI::Box::Horizontal, 0, 0, padding_),
      box_interface_left_(&box_interface_, 0, 0, UI::Box::Vertical, 0, 0, padding_),
@@ -118,19 +104,23 @@
                         100,  // 100 is arbitrary, will be resized in layout().
                         100,  // 100 is arbitrary, will be resized in layout().
                         24,
-                        _("Language")),
+                        _("Language"),
+                        UI::DropdownType::kTextual,
+                        UI::PanelStyle::kFsMenu),
      resolution_dropdown_(&box_interface_left_,
                           0,
                           0,
                           100,  // 100 is arbitrary, will be resized in layout().
                           100,  // 100 is arbitrary, will be resized in layout().
                           24,
-                          _("Window Size")),
+                          _("Window Size"),
+                          UI::DropdownType::kTextual,
+                          UI::PanelStyle::kFsMenu),
 
      fullscreen_(&box_interface_left_, Vector2i::zero(), _("Fullscreen"), "", 0),
-     inputgrab_(&box_interface_left_, Vector2i::zero(), _("Grab input"), "", 0),
-     sb_maxfps_(&box_interface_left_, 0, 0, 0, 0, opt.maxfps, 0, 99, _("Maximum FPS:")),
-     translation_info_(&box_interface_, 0, 0, 100, 100),
+     inputgrab_(&box_interface_left_, Vector2i::zero(), _("Grab Input"), "", 0),
+     sb_maxfps_(&box_interface_left_, 0, 0, 0, 0, opt.maxfps, 0, 99, UI::PanelStyle::kFsMenu, _("Maximum FPS:")),
+     translation_info_(&box_interface_, 0, 0, 100, 100, UI::PanelStyle::kFsMenu),
 
      // Windows options
      snap_win_overlap_only_(
@@ -147,6 +137,7 @@
                    opt.panel_snap_distance,
                    0,
                    99,
+                   UI::PanelStyle::kFsMenu,
                    _("Distance for windows to snap to other panels:"),
                    UI::SpinBox::Units::kPixels),
 
@@ -158,6 +149,7 @@
                     opt.border_snap_distance,
                     0,
                     99,
+                    UI::PanelStyle::kFsMenu,
                     _("Distance for windows to snap to borders:"),
                     UI::SpinBox::Units::kPixels),
 
@@ -175,9 +167,9 @@
                   opt.autosave / 60,
                   0,
                   100,
+                  UI::PanelStyle::kFsMenu,
                   _("Save game automatically every:"),
                   UI::SpinBox::Units::kMinutes,
-                  g_gr->images().get("images/ui_basic/but3.png"),
                   UI::SpinBox::Type::kBig),
 
      sb_rolling_autosave_(&box_saving_,
@@ -188,9 +180,9 @@
                           opt.rolling_autosave,
                           1,
                           20,
+                          UI::PanelStyle::kFsMenu,
                           _("Maximum number of autosave files:"),
                           UI::SpinBox::Units::kNone,
-                          g_gr->images().get("images/ui_basic/but3.png"),
                           UI::SpinBox::Type::kBig),
 
      zip_(&box_saving_,

=== modified file 'src/ui_fsmenu/singleplayer.cc'
--- src/ui_fsmenu/singleplayer.cc	2018-04-07 16:59:00 +0000
+++ src/ui_fsmenu/singleplayer.cc	2018-05-12 13:15:45 +0000
@@ -20,7 +20,6 @@
 #include "ui_fsmenu/singleplayer.h"
 
 #include "base/i18n.h"
-#include "graphic/graphic.h"
 #include "graphic/text_constants.h"
 
 FullscreenMenuSinglePlayer::FullscreenMenuSinglePlayer()
@@ -30,31 +29,12 @@
      title(this, 0, 0, _("Single Player"), UI::Align::kCenter),
 
      // Buttons
-     new_game(&vbox_,
-              "new_game",
-              0,
-              0,
-              butw_,
-              buth_,
-              g_gr->images().get(button_background_),
-              _("New Game")),
-     campaign(&vbox_,
-              "campaigns",
-              0,
-              0,
-              butw_,
-              buth_,
-              g_gr->images().get(button_background_),
-              _("Campaigns")),
-     load_game(&vbox_,
-               "load_game",
-               0,
-               0,
-               butw_,
-               buth_,
-               g_gr->images().get(button_background_),
-               _("Load Game")),
-     back(&vbox_, "back", 0, 0, butw_, buth_, g_gr->images().get(button_background_), _("Back")) {
+     new_game(&vbox_, "new_game", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("New Game")),
+     campaign(
+        &vbox_, "campaigns", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("Campaigns")),
+     load_game(
+        &vbox_, "load_game", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("Load Game")),
+     back(&vbox_, "back", 0, 0, butw_, buth_, UI::ButtonStyle::kFsMenuMenu, _("Back")) {
 	new_game.sigclicked.connect(
 	   boost::bind(&FullscreenMenuSinglePlayer::end_modal<FullscreenMenuBase::MenuTarget>,
 	               boost::ref(*this), FullscreenMenuBase::MenuTarget::kNewGame));

=== modified file 'src/wui/CMakeLists.txt'
--- src/wui/CMakeLists.txt	2018-02-14 17:16:53 +0000
+++ src/wui/CMakeLists.txt	2018-05-12 13:15:45 +0000
@@ -73,7 +73,6 @@
     base_time_string
     helper
     game_io
-    graphic
     graphic_fonthandler
     graphic_image_io
     graphic_surface

=== modified file 'src/wui/actionconfirm.cc'
--- src/wui/actionconfirm.cc	2018-04-07 16:59:00 +0000
+++ src/wui/actionconfirm.cc	2018-05-12 13:15:45 +0000
@@ -132,20 +132,18 @@
 	UI::Box* main_box = new UI::Box(this, padding, padding, UI::Box::Vertical);
 	UI::Box* button_box = new UI::Box(main_box, 0, 0, UI::Box::Horizontal);
 
-	UI::MultilineTextarea* textarea =
-	   new UI::MultilineTextarea(main_box, 0, 0, 200, 74, message, UI::Align::kCenter,
-	                             g_gr->images().get("images/ui_basic/but1.png"),
-	                             UI::MultilineTextarea::ScrollMode::kNoScrolling);
+	UI::MultilineTextarea* textarea = new UI::MultilineTextarea(
+	   main_box, 0, 0, 200, 74, UI::PanelStyle::kWui, message, UI::Align::kCenter,
+	   UI::MultilineTextarea::ScrollMode::kNoScrolling);
 	textarea->force_new_renderer();
 
-	UI::Button* okbtn =
-	   new UI::Button(button_box, "ok", 0, 0, 80, 34, g_gr->images().get("images/ui_basic/but4.png"),
-	                  g_gr->images().get("images/wui/menu_okay.png"));
+	UI::Button* okbtn = new UI::Button(button_box, "ok", 0, 0, 80, 34, UI::ButtonStyle::kWuiMenu,
+	                                   g_gr->images().get("images/wui/menu_okay.png"));
 	okbtn->sigclicked.connect(boost::bind(&ActionConfirm::ok, this));
 
-	UI::Button* cancelbtn = new UI::Button(button_box, "abort", 0, 0, 80, 34,
-	                                       g_gr->images().get("images/ui_basic/but4.png"),
-	                                       g_gr->images().get("images/wui/menu_abort.png"));
+	UI::Button* cancelbtn =
+	   new UI::Button(button_box, "abort", 0, 0, 80, 34, UI::ButtonStyle::kWuiMenu,
+	                  g_gr->images().get("images/wui/menu_abort.png"));
 	cancelbtn->sigclicked.connect(boost::bind(&ActionConfirm::die, this));
 
 	button_box->add(

=== modified file 'src/wui/attack_box.cc'
--- src/wui/attack_box.cc	2018-04-07 16:59:00 +0000
+++ src/wui/attack_box.cc	2018-05-12 13:15:45 +0000
@@ -26,7 +26,6 @@
 
 #include "base/macros.h"
 #include "graphic/font_handler1.h"
-#include "graphic/graphic.h"
 #include "graphic/text/font_set.h"
 #include "graphic/text_constants.h"
 #include "logic/map_objects/tribes/soldier.h"
@@ -60,10 +59,9 @@
                                                             uint32_t min,
                                                             uint32_t max,
                                                             uint32_t initial,
-                                                            char const* picname,
                                                             char const* hint) {
 	std::unique_ptr<UI::HorizontalSlider> result(new UI::HorizontalSlider(
-	   &parent, 0, 0, width, height, min, max, initial, g_gr->images().get(picname), hint));
+	   &parent, 0, 0, width, height, min, max, initial, UI::SliderStyle::kWuiDark, hint));
 	parent.add(result.get());
 	return result;
 }
@@ -81,7 +79,7 @@
                                                   void (AttackBox::*fn)(),
                                                   const std::string& tooltip_text) {
 	std::unique_ptr<UI::Button> button(new UI::Button(&parent, text, 8, 8, 26, 26,
-	                                                  g_gr->images().get("images/ui_basic/but2.png"),
+	                                                  UI::ButtonStyle::kWuiPrimary,
 	                                                  text, tooltip_text));
 	button->sigclicked.connect(boost::bind(fn, boost::ref(*this)));
 	parent.add(button.get());
@@ -144,8 +142,8 @@
 	soldiers_text_.reset(
 	   &add_text(columnbox, attack_string, UI::Align::kCenter, UI_FONT_SIZE_ULTRASMALL));
 
-	soldiers_slider_ = add_slider(columnbox, 100, 10, 0, max_attackers, max_attackers > 0 ? 1 : 0,
-	                              "images/ui_basic/but2.png", _("Number of soldiers"));
+	soldiers_slider_ = add_slider(
+	   columnbox, 100, 10, 0, max_attackers, max_attackers > 0 ? 1 : 0, _("Number of soldiers"));
 
 	soldiers_slider_->changed.connect(boost::bind(&AttackBox::update_attack, this));
 	more_soldiers_ = add_button(linebox, std::to_string(max_attackers),

=== modified file 'src/wui/attack_box.h'
--- src/wui/attack_box.h	2018-04-07 16:59:00 +0000
+++ src/wui/attack_box.h	2018-05-12 13:15:45 +0000
@@ -61,7 +61,6 @@
 	                                                 uint32_t min,
 	                                                 uint32_t max,
 	                                                 uint32_t initial,
-	                                                 char const* picname,
 	                                                 char const* hint);
 	// TODO(GunChleoc): This should also return a unique_ptr
 	UI::Textarea& add_text(UI::Box& parent,

=== modified file 'src/wui/building_statistics_menu.cc'
--- src/wui/building_statistics_menu.cc	2018-04-15 14:37:45 +0000
+++ src/wui/building_statistics_menu.cc	2018-05-12 13:15:45 +0000
@@ -57,9 +57,13 @@
 
 BuildingStatisticsMenu::BuildingStatisticsMenu(InteractivePlayer& parent,
                                                UI::UniqueWindow::Registry& registry)
-   : UI::UniqueWindow(
-        &parent, "building_statistics", &registry, kWindowWidth, 100, _("Building Statistics")),
-     tab_panel_(this, g_gr->images().get("images/ui_basic/but1.png")),
+   : UI::UniqueWindow(&parent,
+                      "building_statistics",
+                      &registry,
+                      kWindowWidth,
+                      100,
+                      _("Building Statistics")),
+     tab_panel_(this, UI::TabPanelStyle::kWuiDark),
      navigation_panel_(this, 0, 0, kWindowWidth, 4 * kButtonRowHeight),
      building_name_(
         &navigation_panel_, get_inner_w() / 2, 0, 0, kButtonHeight, "", UI::Align::kCenter),
@@ -83,7 +87,7 @@
         35,
         0,
         1,
-        g_gr->images().get("images/ui_basic/but1.png"),
+        UI::PanelStyle::kWui,
         kLabelFontSize - UI::g_fh1->fontset()->size_offset()),  // We need consistent height here
      unproductive_label2_(
         &unproductive_box_,
@@ -141,36 +145,32 @@
 
 	navigation_buttons_[NavigationButton::PrevOwned] = new UI::Button(
 	   &navigation_panel_, "previous_owned", get_inner_w() - 2 * kButtonRowHeight, kButtonRowHeight,
-	   kButtonHeight, kButtonHeight, g_gr->images().get("images/ui_basic/but4.png"),
+	   kButtonHeight, kButtonHeight, UI::ButtonStyle::kWuiMenu,
 	   g_gr->images().get("images/ui_basic/scrollbar_left.png"), _("Show previous building"));
 
 	navigation_buttons_[NavigationButton::NextOwned] = new UI::Button(
 	   &navigation_panel_, "next_owned", get_inner_w() - kButtonRowHeight, kButtonRowHeight,
-	   kButtonHeight, kButtonHeight, g_gr->images().get("images/ui_basic/but4.png"),
+	   kButtonHeight, kButtonHeight, UI::ButtonStyle::kWuiMenu,
 	   g_gr->images().get("images/ui_basic/scrollbar_right.png"), _("Show next building"));
 
 	navigation_buttons_[NavigationButton::PrevConstruction] = new UI::Button(
 	   &navigation_panel_, "previous_constructed", get_inner_w() - 2 * kButtonRowHeight,
-	   2 * kButtonRowHeight, kButtonHeight, kButtonHeight,
-	   g_gr->images().get("images/ui_basic/but4.png"),
+	   2 * kButtonRowHeight, kButtonHeight, kButtonHeight, UI::ButtonStyle::kWuiMenu,
 	   g_gr->images().get("images/ui_basic/scrollbar_left.png"), _("Show previous building"));
 
 	navigation_buttons_[NavigationButton::NextConstruction] = new UI::Button(
 	   &navigation_panel_, "next_constructed", get_inner_w() - kButtonRowHeight,
-	   2 * kButtonRowHeight, kButtonHeight, kButtonHeight,
-	   g_gr->images().get("images/ui_basic/but4.png"),
+	   2 * kButtonRowHeight, kButtonHeight, kButtonHeight, UI::ButtonStyle::kWuiMenu,
 	   g_gr->images().get("images/ui_basic/scrollbar_right.png"), _("Show next building"));
 
 	navigation_buttons_[NavigationButton::PrevUnproductive] = new UI::Button(
 	   &navigation_panel_, "previous_unproductive", get_inner_w() - 2 * kButtonRowHeight,
-	   3 * kButtonRowHeight, kButtonHeight, kButtonHeight,
-	   g_gr->images().get("images/ui_basic/but4.png"),
+	   3 * kButtonRowHeight, kButtonHeight, kButtonHeight, UI::ButtonStyle::kWuiMenu,
 	   g_gr->images().get("images/ui_basic/scrollbar_left.png"), _("Show previous building"));
 
 	navigation_buttons_[NavigationButton::NextUnproductive] = new UI::Button(
 	   &navigation_panel_, "next_unproductive", get_inner_w() - kButtonRowHeight,
-	   3 * kButtonRowHeight, kButtonHeight, kButtonHeight,
-	   g_gr->images().get("images/ui_basic/but4.png"),
+	   3 * kButtonRowHeight, kButtonHeight, kButtonHeight, UI::ButtonStyle::kWuiMenu,
 	   g_gr->images().get("images/ui_basic/scrollbar_right.png"), _("Show next building"));
 
 	navigation_buttons_[NavigationButton::PrevOwned]->sigclicked.connect(boost::bind(
@@ -399,11 +399,11 @@
                                         const BuildingDescr& descr,
                                         UI::Box* row) {
 	UI::Box* button_box = new UI::Box(row, 0, 0, UI::Box::Vertical);
-	building_buttons_[id] = new UI::Button(
-	   button_box, (boost::format("building_button%s") % id).str(), 0, 0, kBuildGridCellWidth,
-	   kBuildGridCellHeight, g_gr->images().get("images/ui_basic/but1.png"),
-	   descr.representative_image(&iplayer().get_player()->get_playercolor()), "",
-	   UI::Button::Style::kFlat);
+	building_buttons_[id] =
+	   new UI::Button(button_box, (boost::format("building_button%s") % id).str(), 0, 0,
+	                  kBuildGridCellWidth, kBuildGridCellHeight, UI::ButtonStyle::kWuiBuildingStats,
+	                  descr.representative_image(&iplayer().get_player()->get_playercolor()), "",
+	                  UI::Button::VisualState::kFlat);
 	building_buttons_[id]->set_disable_style(UI::ButtonDisableStyle::kMonochrome |
 	                                         UI::ButtonDisableStyle::kFlat);
 	button_box->add(building_buttons_[id]);
@@ -785,7 +785,7 @@
 		if (building_button == nullptr) {
 			continue;
 		}
-		building_button->set_style(UI::Button::Style::kFlat);
+		building_button->set_visual_state(UI::Button::VisualState::kFlat);
 	}
 
 	// Update for current button

=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2018-04-07 16:59:00 +0000
+++ src/wui/buildingwindow.cc	2018-05-12 13:15:45 +0000