diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index 5cc16119..6ddc6744 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -192,7 +192,7 @@ Hud::Hud(Engine& engine, LevelFrontend& frontend, Player& player)
     gui.add(contentAccessPanel);
 
     auto dplotter = std::make_shared<Plotter>(gui, 350, 250, 2000, 16);
-    dplotter->setGravity(Gravity::bottom_right);
+    dplotter->setGravity(Gravity::BOTTOM_RIGHT);
     dplotter->setInteractive(false);
     add(HudElement(HudElementMode::PERMANENT, nullptr, dplotter, true));
 
diff --git a/src/graphics/core/ImageData.cpp b/src/graphics/core/ImageData.cpp
index bd243832..218428e7 100644
--- a/src/graphics/core/ImageData.cpp
+++ b/src/graphics/core/ImageData.cpp
@@ -470,6 +470,32 @@ void ImageData::addColor(const ImageData& other, int multiplier) {
     }
 }
 
+void ImageData::extend(int newWidth, int newHeight) {
+    size_t comps;
+    switch (format) {
+        case ImageFormat::rgb888: comps = 3; break;
+        case ImageFormat::rgba8888: comps = 4; break;
+        default:
+            throw std::runtime_error("only unsigned byte formats supported");    
+    }
+    auto newData = std::make_unique<ubyte[]>(newWidth * newHeight * comps);
+    for (uint y = 0; y < newHeight; y++) {
+        for (uint x = 0; x < newWidth; x++) {
+            for (size_t c = 0; c < comps; c++) {
+                if (x < width && y < height) {
+                    newData[(y * newWidth + x) * comps + c] =
+                        data[(y * width + x) * comps + c];
+                } else {
+                    newData[(y * newWidth + x) * comps + c] = 0;
+                }
+            }
+        }
+    }
+    data = std::move(newData);
+    width = newWidth;
+    height = newHeight;
+}
+
 void ImageData::addColor(const glm::ivec4& color, int multiplier) {
     uint comps;
     switch (format) {
diff --git a/src/graphics/core/ImageData.hpp b/src/graphics/core/ImageData.hpp
index a1597a98..94987886 100644
--- a/src/graphics/core/ImageData.hpp
+++ b/src/graphics/core/ImageData.hpp
@@ -36,6 +36,7 @@ public:
     void mulColor(const ImageData& other);
     void addColor(const glm::ivec4& color, int multiplier);
     void addColor(const ImageData& other, int multiplier);
+    void extend(int newWidth, int newHeight);
 
     std::unique_ptr<ImageData> cropped(int x, int y, int width, int height) const;
 
diff --git a/src/graphics/core/Texture.cpp b/src/graphics/core/Texture.cpp
index 04285aa8..dcd29e37 100644
--- a/src/graphics/core/Texture.cpp
+++ b/src/graphics/core/Texture.cpp
@@ -44,10 +44,10 @@ void Texture::unbind() const {
 void Texture::reload(const ImageData& image) {
     width = image.getWidth();
     height = image.getHeight();
-    reload(image.getData());
+    reload(image.getData(), width, height);
 }
 
-void Texture::reload(const ubyte* data) {
+void Texture::reload(const ubyte* data, uint width, uint height) {
     glBindTexture(GL_TEXTURE_2D, id);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
         GL_RGBA, GL_UNSIGNED_BYTE, static_cast<const GLvoid*>(data));
diff --git a/src/graphics/core/Texture.hpp b/src/graphics/core/Texture.hpp
index 5e67890c..3c8f1b4c 100644
--- a/src/graphics/core/Texture.hpp
+++ b/src/graphics/core/Texture.hpp
@@ -18,7 +18,7 @@ public:
 
     virtual void bind() const;
     virtual void unbind() const;
-    void reload(const ubyte* data);
+    void reload(const ubyte* data, uint w, uint h);
     void reloadPartial(const ImageData& image, uint x, uint y, uint w, uint h);
 
     void setNearestFilter();
diff --git a/src/graphics/ui/elements/BasePanel.hpp b/src/graphics/ui/elements/BasePanel.hpp
index 08761050..168776a9 100644
--- a/src/graphics/ui/elements/BasePanel.hpp
+++ b/src/graphics/ui/elements/BasePanel.hpp
@@ -30,14 +30,14 @@ namespace gui {
             glm::vec2 size,
             glm::vec4 padding = glm::vec4(0.0f),
             float interval = 2.0f,
-            Orientation orientation = Orientation::vertical
+            Orientation orientation = Orientation::VERTICAL
         )
             : Container(gui, std::move(size)),
             padding(std::move(padding)),
             interval(interval) {
         }
 
-        Orientation orientation = Orientation::vertical;
+        Orientation orientation = Orientation::VERTICAL;
         glm::vec4 padding;
         float interval = 2.0f;
     };
diff --git a/src/graphics/ui/elements/Button.cpp b/src/graphics/ui/elements/Button.cpp
index ef2142ea..2fe6fc6a 100644
--- a/src/graphics/ui/elements/Button.cpp
+++ b/src/graphics/ui/elements/Button.cpp
@@ -31,7 +31,7 @@ Button::Button(
     GUI& gui,
     const std::wstring& text,
     glm::vec4 padding,
-    const onaction& action,
+    const OnAction& action,
     glm::vec2 size
 )
     : Panel(gui, size, padding, 0.0f) {
@@ -42,12 +42,12 @@ Button::Button(
     }
 
     if (action) {
-        listenAction(action);
+        listenClick(action);
     }
     setScrollable(false);
 
     label = std::make_shared<Label>(gui, text);
-    label->setAlign(Align::center);
+    label->setAlign(Align::CENTER);
     label->setSize(getContentSize());
     label->setInteractive(false);
     add(label);
@@ -95,5 +95,5 @@ Align Button::getTextAlign() const {
     if (label) {
         return label->getAlign();
     }
-    return Align::left;
+    return Align::LEFT;
 }
diff --git a/src/graphics/ui/elements/Button.hpp b/src/graphics/ui/elements/Button.hpp
index f4e51d2a..6f5e19fa 100644
--- a/src/graphics/ui/elements/Button.hpp
+++ b/src/graphics/ui/elements/Button.hpp
@@ -19,7 +19,7 @@ namespace gui {
             GUI& gui,
             const std::wstring& text,
             glm::vec4 padding,
-            const onaction& action,
+            const OnAction& action,
             glm::vec2 size = glm::vec2(-1)
         );
 
diff --git a/src/graphics/ui/elements/Canvas.cpp b/src/graphics/ui/elements/Canvas.cpp
index 8d48f6a5..b24066ed 100644
--- a/src/graphics/ui/elements/Canvas.cpp
+++ b/src/graphics/ui/elements/Canvas.cpp
@@ -4,11 +4,11 @@
 #include "graphics/core/DrawContext.hpp"
 #include "graphics/core/Texture.hpp"
 
-gui::Canvas::Canvas(GUI& gui, ImageFormat inFormat, glm::uvec2 inSize)
-    : UINode(gui, inSize) {
-    auto data = std::make_shared<ImageData>(inFormat, inSize.x, inSize.y);
-    mTexture = Texture::from(data.get());
-    mData = std::move(data);
+gui::Canvas::Canvas(GUI& gui, ImageFormat format, glm::uvec2 size)
+    : UINode(gui, size) {
+    auto data = std::make_shared<ImageData>(format, size.x, size.y);
+    texture = Texture::from(data.get());
+    this->data = std::move(data);
 }
 
 void gui::Canvas::draw(const DrawContext& pctx, const Assets& assets) {
@@ -16,6 +16,12 @@ void gui::Canvas::draw(const DrawContext& pctx, const Assets& assets) {
     auto col = calcColor();
 
     auto batch = pctx.getBatch2D();
-    batch->texture(mTexture.get());
+    batch->texture(texture.get());
     batch->rect(pos.x, pos.y, size.x, size.y, 0, 0, 0, {}, false, false, col);
 }
+
+void gui::Canvas::setSize(const glm::vec2& size) {
+    UINode::setSize(size);
+    data->extend(size.x, size.y);
+    texture->reload(*data);
+}
diff --git a/src/graphics/ui/elements/Canvas.hpp b/src/graphics/ui/elements/Canvas.hpp
index 0ed70cd1..7dcb4e2d 100644
--- a/src/graphics/ui/elements/Canvas.hpp
+++ b/src/graphics/ui/elements/Canvas.hpp
@@ -9,21 +9,23 @@ class Texture;
 namespace gui {
     class Canvas final : public UINode {
     public:
-        explicit Canvas(GUI& gui, ImageFormat inFormat, glm::uvec2 inSize);
+        explicit Canvas(GUI& gui, ImageFormat format, glm::uvec2 size);
 
         ~Canvas() override = default;
 
         void draw(const DrawContext& pctx, const Assets& assets) override;
 
-        [[nodiscard]] auto texture() const {
-            return mTexture;
+        void setSize(const glm::vec2& size) override;
+
+        [[nodiscard]] auto getTexture() const {
+            return texture;
         }
 
-        [[nodiscard]] auto data() const {
-            return mData;
+        [[nodiscard]] auto getData() const {
+            return data;
         }
     private:
-        std::shared_ptr<::Texture> mTexture;
-        std::shared_ptr<ImageData> mData;
+        std::shared_ptr<::Texture> texture;
+        std::shared_ptr<ImageData> data;
     };
 }
diff --git a/src/graphics/ui/elements/CheckBox.cpp b/src/graphics/ui/elements/CheckBox.cpp
index 0af08e95..22741e45 100644
--- a/src/graphics/ui/elements/CheckBox.cpp
+++ b/src/graphics/ui/elements/CheckBox.cpp
@@ -52,7 +52,7 @@ FullCheckBox::FullCheckBox(
       checkbox(std::make_shared<CheckBox>(gui, checked)),
       label(std::make_shared<Label>(gui, text)) {
     setColor(glm::vec4(0.0f));
-    setOrientation(Orientation::horizontal);
+    setOrientation(Orientation::HORIZONTAL);
 
     add(checkbox);
 
diff --git a/src/graphics/ui/elements/CheckBox.hpp b/src/graphics/ui/elements/CheckBox.hpp
index d16c031a..5ca14461 100644
--- a/src/graphics/ui/elements/CheckBox.hpp
+++ b/src/graphics/ui/elements/CheckBox.hpp
@@ -64,7 +64,7 @@ namespace gui {
             checkbox->setTooltip(text);
         }
 
-        virtual void setSize(glm::vec2 new_size) override {
+        virtual void setSize(const glm::vec2& new_size) override {
             Panel::setSize(new_size);
             checkbox->setSize(glm::vec2(size.y, size.y));
         }
diff --git a/src/graphics/ui/elements/Container.cpp b/src/graphics/ui/elements/Container.cpp
index 5d5375c1..9a9b4608 100644
--- a/src/graphics/ui/elements/Container.cpp
+++ b/src/graphics/ui/elements/Container.cpp
@@ -211,11 +211,11 @@ void Container::clear() {
     refresh();
 }
 
-void Container::listenInterval(float interval, ontimeout callback, int repeat) {
+void Container::listenInterval(float interval, OnTimeOut callback, int repeat) {
     intervalEvents.push_back({std::move(callback), interval, 0.0f, repeat});
 }
 
-void Container::setSize(glm::vec2 size) {
+void Container::setSize(const glm::vec2& size) {
     if (size == getSize()) {
         return;
     }
diff --git a/src/graphics/ui/elements/Container.hpp b/src/graphics/ui/elements/Container.hpp
index d3dbbfc7..dd7dfd34 100644
--- a/src/graphics/ui/elements/Container.hpp
+++ b/src/graphics/ui/elements/Container.hpp
@@ -36,9 +36,9 @@ namespace gui {
         virtual void remove(const std::string& id);
         virtual void scrolled(int value) override;
         virtual void setScrollable(bool flag);
-        void listenInterval(float interval, ontimeout callback, int repeat=-1);
+        void listenInterval(float interval, OnTimeOut callback, int repeat=-1);
         virtual glm::vec2 getContentOffset() override {return glm::vec2(0.0f, scroll);};
-        virtual void setSize(glm::vec2 size) override;
+        virtual void setSize(const glm::vec2& size) override;
         virtual int getScrollStep() const;
         virtual void setScrollStep(int step);
         virtual void refresh() override;
diff --git a/src/graphics/ui/elements/InlineFrame.cpp b/src/graphics/ui/elements/InlineFrame.cpp
index 5df635b8..50fc7976 100644
--- a/src/graphics/ui/elements/InlineFrame.cpp
+++ b/src/graphics/ui/elements/InlineFrame.cpp
@@ -43,7 +43,7 @@ void InlineFrame::act(float delta) {
     Container::act(delta);
 }
 
-void InlineFrame::setSize(glm::vec2 size) {
+void InlineFrame::setSize(const glm::vec2& size) {
     Container::setSize(size);
     if (root) {
         root->setSize(size);
diff --git a/src/graphics/ui/elements/InlineFrame.hpp b/src/graphics/ui/elements/InlineFrame.hpp
index 41ad7345..403881e7 100644
--- a/src/graphics/ui/elements/InlineFrame.hpp
+++ b/src/graphics/ui/elements/InlineFrame.hpp
@@ -5,7 +5,7 @@
 class UiDocument;
 
 namespace gui {
-    class InlineFrame : public Container {
+    class InlineFrame final : public Container {
     public:
         explicit InlineFrame(GUI& gui);
         virtual ~InlineFrame();
@@ -14,7 +14,7 @@ namespace gui {
         void setDocument(const std::shared_ptr<UiDocument>& document);
 
         void act(float delta) override;
-        void setSize(glm::vec2 size) override;
+        void setSize(const glm::vec2& size) override;
 
         const std::string& getSrc() const;
     private:
diff --git a/src/graphics/ui/elements/InputBindBox.hpp b/src/graphics/ui/elements/InputBindBox.hpp
index a6719996..6f4a564e 100644
--- a/src/graphics/ui/elements/InputBindBox.hpp
+++ b/src/graphics/ui/elements/InputBindBox.hpp
@@ -5,7 +5,7 @@
 namespace gui {
     class Label;
 
-    class InputBindBox : public Panel {
+    class InputBindBox final : public Panel {
     protected:
         Binding& binding;
         glm::vec4 focusedColor {0.1f, 0.15f, 0.35f, 0.75f};
@@ -15,13 +15,13 @@ namespace gui {
             GUI& gui, Binding& binding, glm::vec4 padding = glm::vec4(6.0f)
         );
 
-        virtual void drawBackground(
+        void drawBackground(
             const DrawContext& pctx, const Assets& assets
         ) override;
 
-        virtual void clicked(Mousecode button) override;
-        virtual void keyPressed(Keycode key) override;
-        virtual bool isFocuskeeper() const override {
+        void clicked(Mousecode button) override;
+        void keyPressed(Keycode key) override;
+        bool isFocuskeeper() const override {
             return true;
         }
     };
diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp
index 6aadd3c4..d3a74722 100644
--- a/src/graphics/ui/elements/InventoryView.cpp
+++ b/src/graphics/ui/elements/InventoryView.cpp
@@ -528,14 +528,14 @@ void InventoryView::setSelected(int index) {
     }
 }
 
-void InventoryView::setPos(glm::vec2 pos) {
+void InventoryView::setPos(const glm::vec2& pos) {
     Container::setPos(pos - origin);
 }
 
-void InventoryView::setOrigin(glm::vec2 origin) {
+void InventoryView::setOrigin(const glm::vec2& origin) {
     this->origin = origin;
 }
 
-glm::vec2 InventoryView::getOrigin() const {
+const glm::vec2& InventoryView::getOrigin() const {
     return origin;
 }
diff --git a/src/graphics/ui/elements/InventoryView.hpp b/src/graphics/ui/elements/InventoryView.hpp
index 64ec5c99..b80f65e6 100644
--- a/src/graphics/ui/elements/InventoryView.hpp
+++ b/src/graphics/ui/elements/InventoryView.hpp
@@ -109,7 +109,7 @@ namespace gui {
         static inline std::string EXCHANGE_SLOT_NAME = "exchange-slot";
     };
 
-    class InventoryView : public gui::Container {
+    class InventoryView final : public gui::Container {
         const Content* content = nullptr;
         
         std::shared_ptr<Inventory> inventory;
@@ -120,10 +120,10 @@ namespace gui {
         InventoryView(GUI& gui);
         virtual ~InventoryView();
 
-        virtual void setPos(glm::vec2 pos) override;
+        void setPos(const glm::vec2& pos) override;
 
-        void setOrigin(glm::vec2 origin);
-        glm::vec2 getOrigin() const;
+        void setOrigin(const glm::vec2& origin);
+        const glm::vec2& getOrigin() const;
 
         void setSelected(int index);
 
diff --git a/src/graphics/ui/elements/Label.cpp b/src/graphics/ui/elements/Label.cpp
index 80b28fc2..374c088a 100644
--- a/src/graphics/ui/elements/Label.cpp
+++ b/src/graphics/ui/elements/Label.cpp
@@ -230,14 +230,14 @@ void Label::draw(const DrawContext& pctx, const Assets& assets) {
 
     glm::vec2 pos = calcPos();
     switch (align) {
-        case Align::left: break;
-        case Align::center: pos.x += (size.x-newsize.x)*0.5f; break;
-        case Align::right: pos.x += size.x-newsize.x; break;
+        case Align::LEFT: break;
+        case Align::CENTER: pos.x += (size.x-newsize.x)*0.5f; break;
+        case Align::RIGHT: pos.x += size.x-newsize.x; break;
     }
     switch (valign) {
-        case Align::top: break;
-        case Align::center: pos.y += (size.y-newsize.y)*0.5f; break;
-        case Align::bottom: pos.y += size.y-newsize.y; break;
+        case Align::TOP: break;
+        case Align::CENTER: pos.y += (size.y-newsize.y)*0.5f; break;
+        case Align::BOTTOM: pos.y += size.y-newsize.y; break;
     }
     textYOffset = pos.y-calcPos().y;
     totalLineHeight = lineHeight;
diff --git a/src/graphics/ui/elements/Label.hpp b/src/graphics/ui/elements/Label.hpp
index df6e4c6a..07f9e91c 100644
--- a/src/graphics/ui/elements/Label.hpp
+++ b/src/graphics/ui/elements/Label.hpp
@@ -44,7 +44,7 @@ namespace gui {
         float lineInterval = 1.5f;
 
         /// @brief Vertical alignment (only when multiline is set to false)
-        Align valign = Align::center;
+        Align valign = Align::CENTER;
 
         /// @brief Line separators and wrapping will be ignored if set to false
         bool multiline = false;
diff --git a/src/graphics/ui/elements/Panel.cpp b/src/graphics/ui/elements/Panel.cpp
index dacad58b..945c45e7 100644
--- a/src/graphics/ui/elements/Panel.cpp
+++ b/src/graphics/ui/elements/Panel.cpp
@@ -72,7 +72,7 @@ void Panel::refresh() {
     float x = padding.x;
     float y = padding.y;
     glm::vec2 size = getSize();
-    if (orientation == Orientation::vertical) {
+    if (orientation == Orientation::VERTICAL) {
         float maxw = size.x;
         for (auto& node : nodes) {
             const glm::vec4 margin = node->getMargin();
diff --git a/src/graphics/ui/elements/SelectBox.cpp b/src/graphics/ui/elements/SelectBox.cpp
index 102c346c..7273294b 100644
--- a/src/graphics/ui/elements/SelectBox.cpp
+++ b/src/graphics/ui/elements/SelectBox.cpp
@@ -19,7 +19,7 @@ SelectBox::SelectBox(
     : Button(gui, selected.text, padding, nullptr, glm::vec2(contentWidth, -1)),
       options(std::move(options)) {
 
-    listenAction([this](GUI& gui) {
+    listenClick([this](GUI& gui) {
         auto panel = std::make_shared<Panel>(gui, getSize());
         panel->setPos(calcPos() + glm::vec2(0, size.y));
         for (const auto& option : this->options) {
@@ -41,7 +41,7 @@ SelectBox::SelectBox(
     });
 }
 
-void SelectBox::listenChange(onstringchange&& callback) {
+void SelectBox::listenChange(OnStringChange&& callback) {
     changeCallbacks.listen(std::move(callback));
 }
 
diff --git a/src/graphics/ui/elements/SelectBox.hpp b/src/graphics/ui/elements/SelectBox.hpp
index 1ee96839..7b42aad1 100644
--- a/src/graphics/ui/elements/SelectBox.hpp
+++ b/src/graphics/ui/elements/SelectBox.hpp
@@ -24,7 +24,7 @@ namespace gui {
             const glm::vec4& padding
         );
 
-        void listenChange(onstringchange&& callback);
+        void listenChange(OnStringChange&& callback);
 
         void setSelected(const Option& selected);
 
diff --git a/src/graphics/ui/elements/SplitBox.cpp b/src/graphics/ui/elements/SplitBox.cpp
index c1fbcbcc..247ef741 100644
--- a/src/graphics/ui/elements/SplitBox.cpp
+++ b/src/graphics/ui/elements/SplitBox.cpp
@@ -7,7 +7,7 @@ using namespace gui;
 SplitBox::SplitBox(GUI& gui, const glm::vec2& size, float splitPos, Orientation orientation)
  : BasePanel(gui, size, glm::vec4(), 4.0f, orientation), splitPos(splitPos) {
     setCursor(
-        orientation == Orientation::vertical ? CursorShape::NS_RESIZE
+        orientation == Orientation::VERTICAL ? CursorShape::NS_RESIZE
                                              : CursorShape::EW_RESIZE
     );
 }
@@ -17,7 +17,7 @@ void SplitBox::mouseMove(int x, int y) {
     auto size = getSize();
     
     glm::ivec2 cursor(x - pos.x, y - pos.y);
-    int axis = orientation == Orientation::vertical;
+    int axis = orientation == Orientation::VERTICAL;
 
     int v = cursor[axis];
     v = std::max(std::min(static_cast<int>(size[axis]) - 10, v), 10);
@@ -61,7 +61,7 @@ void SplitBox::refresh() {
     nodeA->setPos(glm::vec2(padding));
 
     const auto& p = padding;
-    if (orientation == Orientation::vertical) {
+    if (orientation == Orientation::VERTICAL) {
         float splitPos = this->splitPos * size.y;
         nodeA->setSize({size.x-p.x-p.z, splitPos - sepRadius - p.y});
         nodeB->setSize({size.x-p.x-p.z, size.y - splitPos - sepRadius - p.w});
diff --git a/src/graphics/ui/elements/TextBox.cpp b/src/graphics/ui/elements/TextBox.cpp
index a09a47fa..8f24217d 100644
--- a/src/graphics/ui/elements/TextBox.cpp
+++ b/src/graphics/ui/elements/TextBox.cpp
@@ -216,7 +216,7 @@ TextBox::TextBox(GUI& gui, std::wstring placeholder, glm::vec4 padding)
     lineNumbersLabel->setSize(
         size - glm::vec2(padding.z + padding.x, padding.w + padding.y)
     );
-    lineNumbersLabel->setVerticalAlign(Align::top);
+    lineNumbersLabel->setVerticalAlign(Align::TOP);
     add(lineNumbersLabel);
 
     setHoverColor(glm::vec4(0.05f, 0.1f, 0.2f, 0.75f));
@@ -565,7 +565,7 @@ bool TextBox::isValid() const {
 void TextBox::setMultiline(bool multiline) {
     this->multiline = multiline;
     label->setMultiline(multiline);
-    label->setVerticalAlign(multiline ? Align::top : Align::center);
+    label->setVerticalAlign(multiline ? Align::TOP : Align::CENTER);
 }
 
 bool TextBox::isMultiline() const {
diff --git a/src/graphics/ui/elements/UINode.cpp b/src/graphics/ui/elements/UINode.cpp
index 8c3c0765..91973150 100644
--- a/src/graphics/ui/elements/UINode.cpp
+++ b/src/graphics/ui/elements/UINode.cpp
@@ -64,29 +64,24 @@ UINode* UINode::getParent() const {
     return parent;
 }
 
-UINode* UINode::listenAction(const onaction& action) {
-    actions.listen(action);
-    return this;
+void UINode::listenClick(OnAction action) {
+    actions.listen(UIAction::CLICK, std::move(action));
 }
 
-UINode* UINode::listenRightClick(const onaction& action) {
-    rightClickCallbacks.listen(action);
-    return this;
+void UINode::listenRightClick(OnAction action) {
+    actions.listen(UIAction::RIGHT_CLICK, std::move(action));
 }
 
-UINode* UINode::listenDoubleClick(const onaction& action) {
-    doubleClickCallbacks.listen(action);
-    return this;
+void UINode::listenDoubleClick(OnAction action) {
+    actions.listen(UIAction::DOUBLE_CLICK, std::move(action));
 }
 
-UINode* UINode::listenFocus(const onaction& action) {
-    focusCallbacks.listen(action);
-    return this;
+void UINode::listenFocus(OnAction action) {
+    actions.listen(UIAction::FOCUS, std::move(action));
 }
 
-UINode* UINode::listenDefocus(const onaction& action) {
-    defocusCallbacks.listen(action);
-    return this;
+void UINode::listenDefocus(OnAction action) {
+    actions.listen(UIAction::DEFOCUS, std::move(action));
 }
 
 void UINode::click(int, int) {
@@ -95,21 +90,21 @@ void UINode::click(int, int) {
 
 void UINode::clicked(Mousecode button) {
     if (button == Mousecode::BUTTON_2) {
-        rightClickCallbacks.notify(gui);
+        actions.notify(UIAction::RIGHT_CLICK, gui);
     }
 }
 
 void UINode::doubleClick(int x, int y) {
     pressed = true;
     if (isInside(glm::vec2(x, y))) {
-        doubleClickCallbacks.notify(gui);
+        actions.notify(UIAction::DOUBLE_CLICK, gui);
     }
 }
 
 void UINode::mouseRelease(int x, int y) {
     pressed = false;
     if (isInside(glm::vec2(x, y))) {
-        actions.notify(gui);
+        actions.notify(UIAction::CLICK, gui);
     }
 }
 
@@ -119,12 +114,12 @@ bool UINode::isPressed() const {
 
 void UINode::onFocus() {
     focused = true;
-    focusCallbacks.notify(gui);
+    actions.notify(UIAction::FOCUS, gui);
 }
 
 void UINode::defocus() {
     focused = false;
-    defocusCallbacks.notify(gui);
+    actions.notify(UIAction::DEFOCUS, gui);
 }
 
 bool UINode::isFocused() const {
@@ -208,7 +203,7 @@ glm::vec4 UINode::calcColor() const {
     return color;
 }
 
-void UINode::setPos(glm::vec2 pos) {
+void UINode::setPos(const glm::vec2& pos) {
     this->pos = pos;
 }
 
@@ -220,7 +215,7 @@ glm::vec2 UINode::getSize() const {
     return size;
 }
 
-void UINode::setSize(glm::vec2 size) {
+void UINode::setSize(const glm::vec2& size) {
     this->size = glm::vec2(
         glm::max(minSize.x, glm::min(maxSize.x, size.x)),
         glm::max(minSize.y, glm::min(maxSize.y, size.y))
@@ -231,7 +226,7 @@ glm::vec2 UINode::getMinSize() const {
     return minSize;
 }
 
-void UINode::setMinSize(glm::vec2 minSize) {
+void UINode::setMinSize(const glm::vec2& minSize) {
     this->minSize = minSize;
     setSize(getSize());
 }
@@ -240,7 +235,7 @@ glm::vec2 UINode::getMaxSize() const {
     return maxSize;
 }
 
-void UINode::setMaxSize(glm::vec2 maxSize) {
+void UINode::setMaxSize(const glm::vec2& maxSize) {
     this->maxSize = maxSize;
     setSize(getSize());
 }
@@ -345,7 +340,7 @@ void UINode::reposition() {
 }
 
 void UINode::setGravity(Gravity gravity) {
-    if (gravity == Gravity::none) {
+    if (gravity == Gravity::NONE) {
         setPositionFunc(nullptr);
         return;
     }
@@ -360,27 +355,27 @@ void UINode::setGravity(Gravity gravity) {
 
         float x = 0.0f, y = 0.0f;
         switch (gravity) {
-            case Gravity::top_left:
-            case Gravity::center_left:
-            case Gravity::bottom_left: x = margin.x; break;
-            case Gravity::top_center:
-            case Gravity::center_center:
-            case Gravity::bottom_center: x = (parentSize.x-size.x)/2.0f; break;
-            case Gravity::top_right:
-            case Gravity::center_right:
-            case Gravity::bottom_right: x = parentSize.x-size.x-margin.z; break;
+            case Gravity::TOP_LEFT:
+            case Gravity::CENTER_LEFT:
+            case Gravity::BOTTOM_LEFT: x = margin.x; break;
+            case Gravity::TOP_CENTER:
+            case Gravity::CENTER_CENTER:
+            case Gravity::BOTTOM_CENTER: x = (parentSize.x-size.x)/2.0f; break;
+            case Gravity::TOP_RIGHT:
+            case Gravity::CENTER_RIGHT:
+            case Gravity::BOTTOM_RIGHT: x = parentSize.x-size.x-margin.z; break;
             default: break;
         }
         switch (gravity) {
-            case Gravity::top_left:
-            case Gravity::top_center:
-            case Gravity::top_right: y = margin.y; break;
-            case Gravity::center_left:
-            case Gravity::center_center:
-            case Gravity::center_right: y = (parentSize.y-size.y)/2.0f; break;
-            case Gravity::bottom_left:
-            case Gravity::bottom_center:
-            case Gravity::bottom_right: y = parentSize.y-size.y-margin.w; break;
+            case Gravity::TOP_LEFT:
+            case Gravity::TOP_CENTER:
+            case Gravity::TOP_RIGHT: y = margin.y; break;
+            case Gravity::CENTER_LEFT:
+            case Gravity::CENTER_CENTER:
+            case Gravity::CENTER_RIGHT: y = (parentSize.y-size.y)/2.0f; break;
+            case Gravity::BOTTOM_LEFT:
+            case Gravity::BOTTOM_CENTER:
+            case Gravity::BOTTOM_RIGHT: y = parentSize.y-size.y-margin.w; break;
             default: break;
         }
         return glm::vec2(x, y);
diff --git a/src/graphics/ui/elements/UINode.hpp b/src/graphics/ui/elements/UINode.hpp
index 6024f841..8aa51f5c 100644
--- a/src/graphics/ui/elements/UINode.hpp
+++ b/src/graphics/ui/elements/UINode.hpp
@@ -19,9 +19,9 @@ namespace gui {
     class GUI;
     class Container;
 
-    using onaction = std::function<void(GUI&)>;
-    using onnumberchange = std::function<void(GUI&, double)>;
-    using onstringchange = std::function<void(GUI&, const std::string&)>;
+    using OnAction = std::function<void(GUI&)>;
+    using OnNumberChange = std::function<void(GUI&, double)>;
+    using OnStringChange = std::function<void(GUI&, const std::string&)>;
 
     template<typename... Args>
     class CallbacksSet {
@@ -46,28 +46,60 @@ namespace gui {
         }
     };
 
-    using ActionsSet = CallbacksSet<GUI&>;
+    template<class TagT, typename... Args>
+    class TaggedCallbacksSet {
+    public:
+        using Func = std::function<void(Args...)>;
+    private:
+        std::unique_ptr<std::vector<std::pair<TagT, Func>>> callbacks;
+    public:
+        void listen(TagT tag, Func&& callback) {
+            if (callbacks == nullptr) {
+                callbacks =
+                    std::make_unique<std::vector<std::pair<TagT, Func>>>();
+            }
+            callbacks->push_back({tag, std::move(callback)});
+        }
+
+        void notify(TagT notifyTag, Args&&... args) {
+            if (callbacks == nullptr) {
+                return;
+            }
+            for (const auto& [tag, callback] : * callbacks) {
+                if (tag != notifyTag) {
+                    continue;
+                }
+                callback(args...);
+            }
+        }
+    };
+
+    enum class UIAction {
+        CLICK, DOUBLE_CLICK, FOCUS, DEFOCUS, RIGHT_CLICK
+    };
+
+    using ActionsSet = TaggedCallbacksSet<UIAction, GUI&>;
     using StringCallbacksSet = CallbacksSet<GUI&, const std::string&>;
     
     enum class Align {
-        left, center, right,
-        top=left, bottom=right,
+        LEFT, CENTER, RIGHT,
+        TOP=LEFT, BOTTOM=RIGHT,
     };
 
     enum class Gravity {
-        none,
+        NONE,
         
-        top_left,
-        top_center,
-        top_right,
+        TOP_LEFT,
+        TOP_CENTER,
+        TOP_RIGHT,
 
-        center_left,
-        center_center,
-        center_right,
+        CENTER_LEFT,
+        CENTER_CENTER,
+        CENTER_RIGHT,
 
-        bottom_left,
-        bottom_center,
-        bottom_right
+        BOTTOM_LEFT,
+        BOTTOM_CENTER,
+        BOTTOM_RIGHT
     };
 
     /// @brief Base abstract class for all UI elements
@@ -112,23 +144,15 @@ namespace gui {
         /// @brief z-index property specifies the stack order of an element
         int zindex = 0;
         /// @brief element content alignment (supported by Label only)
-        Align align = Align::left;
+        Align align = Align::LEFT;
         /// @brief parent element
         UINode* parent = nullptr;
         /// @brief position supplier for the element (called on parent element size update)
         vec2supplier positionfunc = nullptr;
         /// @brief size supplier for the element (called on parent element size update)
         vec2supplier sizefunc = nullptr;
-        /// @brief 'onclick' callbacks
+        /// @brief parameterless callbacks
         ActionsSet actions;
-        /// @brief 'onrightclick' callbacks
-        ActionsSet rightClickCallbacks;
-        /// @brief 'ondoubleclick' callbacks
-        ActionsSet doubleClickCallbacks;
-        /// @brief 'onfocus' callbacks
-        ActionsSet focusCallbacks;
-        /// @brief 'ondefocus' callbacks
-        ActionsSet defocusCallbacks;
         /// @brief element tooltip text
         std::wstring tooltip;
         /// @brief element tooltip delay
@@ -189,11 +213,11 @@ namespace gui {
         /// @brief Get element z-index
         int getZIndex() const;
 
-        virtual UINode* listenAction(const onaction& action);
-        virtual UINode* listenRightClick(const onaction& action);
-        virtual UINode* listenDoubleClick(const onaction& action);
-        virtual UINode* listenFocus(const onaction& action);
-        virtual UINode* listenDefocus(const onaction& action);
+        virtual void listenClick(OnAction action);
+        virtual void listenRightClick(OnAction action);
+        virtual void listenDoubleClick(OnAction action);
+        virtual void listenFocus(OnAction action);
+        virtual void listenDefocus(OnAction action);
 
         virtual void onFocus();
         virtual void doubleClick(int x, int y);
@@ -246,14 +270,14 @@ namespace gui {
         virtual glm::vec2 getContentOffset() {return glm::vec2(0.0f);};
         /// @brief Calculate screen position of the element
         virtual glm::vec2 calcPos() const;
-        virtual void setPos(glm::vec2 pos);
+        virtual void setPos(const glm::vec2& pos);
         virtual glm::vec2 getPos() const;
         glm::vec2 getSize() const;
-        virtual void setSize(glm::vec2 size);
+        virtual void setSize(const glm::vec2& size);
         glm::vec2 getMinSize() const;
-        virtual void setMinSize(glm::vec2 size);
+        virtual void setMinSize(const glm::vec2& size);
         glm::vec2 getMaxSize() const;
-        virtual void setMaxSize(glm::vec2 size);
+        virtual void setMaxSize(const glm::vec2& size);
         /// @brief Called in containers when new element added
         virtual void refresh() {};
         virtual void fullRefresh() {
diff --git a/src/graphics/ui/elements/commons.hpp b/src/graphics/ui/elements/commons.hpp
index 82a36929..8012abeb 100644
--- a/src/graphics/ui/elements/commons.hpp
+++ b/src/graphics/ui/elements/commons.hpp
@@ -3,12 +3,12 @@
 #include <functional>
 
 namespace gui {
-    enum class Orientation { vertical, horizontal };
+    enum class Orientation { VERTICAL, HORIZONTAL };
     
-    using ontimeout = std::function<void()>;
+    using OnTimeOut = std::function<void()>;
 
     struct IntervalEvent {
-        ontimeout callback;
+        OnTimeOut callback;
         float interval;
         float timer;
         // -1 - infinity, 1 - one time event
diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp
index 4e521715..9eab2742 100644
--- a/src/graphics/ui/gui_util.cpp
+++ b/src/graphics/ui/gui_util.cpp
@@ -101,7 +101,7 @@ void guiutil::confirm(
         gui, glm::vec2(600, 200), glm::vec4(8.0f), 8.0f
     );
 
-    panel->setGravity(Gravity::center_center);
+    panel->setGravity(Gravity::CENTER_CENTER);
     container->add(panel);
     panel->setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.5f));
 
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index 32e59b73..6dee06eb 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -30,31 +30,31 @@
 using namespace gui;
 
 static Align align_from_string(std::string_view str, Align def) {
-    if (str == "left") return Align::left;
-    if (str == "center") return Align::center;
-    if (str == "right") return Align::right;
-    if (str == "top") return Align::top;
-    if (str == "bottom") return Align::bottom;
+    if (str == "left") return Align::LEFT;
+    if (str == "center") return Align::CENTER;
+    if (str == "right") return Align::RIGHT;
+    if (str == "top") return Align::TOP;
+    if (str == "bottom") return Align::BOTTOM;
     return def;
 }
 
 static Gravity gravity_from_string(const std::string& str) {
     static const std::unordered_map<std::string, Gravity> gravity_names {
-        {"top-left", Gravity::top_left},
-        {"top-center", Gravity::top_center},
-        {"top-right", Gravity::top_right},
-        {"center-left", Gravity::center_left},
-        {"center-center", Gravity::center_center},
-        {"center-right", Gravity::center_right},
-        {"bottom-left", Gravity::bottom_left},
-        {"bottom-center", Gravity::bottom_center},
-        {"bottom-right", Gravity::bottom_right},
+        {"top-left", Gravity::TOP_LEFT},
+        {"top-center", Gravity::TOP_CENTER},
+        {"top-right", Gravity::TOP_RIGHT},
+        {"center-left", Gravity::CENTER_LEFT},
+        {"center-center", Gravity::CENTER_CENTER},
+        {"center-right", Gravity::CENTER_RIGHT},
+        {"bottom-left", Gravity::BOTTOM_LEFT},
+        {"bottom-center", Gravity::BOTTOM_CENTER},
+        {"bottom-right", Gravity::BOTTOM_RIGHT},
     };
     auto found = gravity_names.find(str);
     if (found != gravity_names.end()) {
         return found->second;
     }
-    return Gravity::none;
+    return Gravity::NONE;
 }
 
 static runnable create_runnable(
@@ -73,7 +73,7 @@ static runnable create_runnable(
     return nullptr;
 }
 
-static onaction create_action(
+static OnAction create_action(
     const UiXmlReader& reader,
     const xml::xmlelement& element,
     const std::string& name
@@ -178,7 +178,7 @@ static void read_uinode(
     }
 
     if (auto onclick = create_action(reader, element, "onclick")) {
-        node.listenAction(onclick);
+        node.listenClick(onclick);
     }
 
     if (auto onclick = create_action(reader, element, "onrightclick")) {
@@ -252,7 +252,7 @@ static void read_base_panel_impl(
     if (element.has("orientation")) {
         auto& oname = element.attr("orientation").getText();
         if (oname == "horizontal") {
-            panel.setOrientation(Orientation::horizontal);
+            panel.setOrientation(Orientation::HORIZONTAL);
         }
     }
 }
@@ -277,7 +277,7 @@ static void read_panel_impl(
     if (element.has("orientation")) {
         auto& oname = element.attr("orientation").getText();
         if (oname == "horizontal") {
-            panel.setOrientation(Orientation::horizontal);
+            panel.setOrientation(Orientation::HORIZONTAL);
         }
     }
     if (subnodes) {
@@ -338,7 +338,7 @@ static std::shared_ptr<UINode> read_label(
     if (element.has("multiline")) {
         label->setMultiline(element.attr("multiline").asBool());
         if (!element.has("valign")) {
-            label->setVerticalAlign(Align::top);
+            label->setVerticalAlign(Align::TOP);
         }
     }
     if (element.has("text-wrap")) {
@@ -364,8 +364,8 @@ static std::shared_ptr<UINode> read_split_box(
     float splitPos = element.attr("split-pos", "0.5").asFloat();
     Orientation orientation =
         element.attr("orientation", "vertical").getText() == "horizontal"
-            ? Orientation::horizontal
-            : Orientation::vertical;
+            ? Orientation::HORIZONTAL
+            : Orientation::VERTICAL;
     auto splitBox = std::make_shared<SplitBox>(
         reader.getGUI(), glm::vec2(), splitPos, orientation
     );
diff --git a/src/logic/scripting/lua/libs/libgui.cpp b/src/logic/scripting/lua/libs/libgui.cpp
index cdf65898..6e703104 100644
--- a/src/logic/scripting/lua/libs/libgui.cpp
+++ b/src/logic/scripting/lua/libs/libgui.cpp
@@ -380,7 +380,7 @@ static int p_get_region(UINode* node, lua::State* L) {
 
 static int p_get_data(UINode* node, lua::State* L) {
     if (auto canvas = dynamic_cast<Canvas*>(node)) {
-        return lua::newuserdata<lua::LuaCanvas>(L, canvas->texture(), canvas->data());
+        return lua::newuserdata<lua::LuaCanvas>(L, canvas->getTexture(), canvas->getData());
     }
     return 0;
 }