diff --git a/engine/includes/components/textrender.h b/engine/includes/components/textrender.h
index f4195d5f9..bb6797581 100644
--- a/engine/includes/components/textrender.h
+++ b/engine/includes/components/textrender.h
@@ -55,8 +55,6 @@ class ENGINE_EXPORT TextRender : public Renderable {
     bool kerning() const;
     void setKerning(const bool kerning);
 
-    static Vector2 cursorPosition(Font *font, int size, const TString &text, bool kerning, const Vector2 &boundaries);
-
 private:
     Mesh *meshToDraw(int instance) override;
 
diff --git a/engine/includes/pipelinecontext.h b/engine/includes/pipelinecontext.h
index 508c7cb25..69f22a13c 100644
--- a/engine/includes/pipelinecontext.h
+++ b/engine/includes/pipelinecontext.h
@@ -87,6 +87,8 @@ class ENGINE_EXPORT PipelineContext : public Object {
     static Mesh *defaultPlane();
     static Mesh *defaultCube();
 
+    static Texture *whiteTexture();
+
 private:
     void analizeGraph();
 
diff --git a/engine/includes/resources/font.h b/engine/includes/resources/font.h
index f2e60aa7b..706d4fa46 100644
--- a/engine/includes/resources/font.h
+++ b/engine/includes/resources/font.h
@@ -42,7 +42,7 @@ class ENGINE_EXPORT Font : public Sprite {
 
     float lineHeight() const;
 
-    float cursorWidth() const;
+    float textWidth(const TString &text, int size, bool kerning);
 
     void composeMesh(Mesh *mesh, const TString &text, int size, int alignment, bool kerning, bool wrap, const Vector2 &boundaries);
 
@@ -69,7 +69,6 @@ class ENGINE_EXPORT Font : public Sprite {
 
     float m_spaceWidth;
     float m_lineHeight;
-    float m_cursorWidth;
 
     bool m_useKerning;
 
diff --git a/engine/src/components/component.cpp b/engine/src/components/component.cpp
index bb52a5d04..86f17980b 100644
--- a/engine/src/components/component.cpp
+++ b/engine/src/components/component.cpp
@@ -44,6 +44,9 @@ Actor *Component::actor() const {
 Scene *Component::scene() const {
     return actor()->scene();
 }
+/*!
+    Returns a World which the Component is attached to.
+*/
 World *Component::world() const {
     Scene *scene = Component::scene();
     if(scene) {
diff --git a/engine/src/components/textrender.cpp b/engine/src/components/textrender.cpp
index e42ad6324..466c505a8 100644
--- a/engine/src/components/textrender.cpp
+++ b/engine/src/components/textrender.cpp
@@ -240,69 +240,6 @@ AABBox TextRender::localBound() const {
 
     return Renderable::localBound();
 }
-/*!
-    \fn Vector2 TextRender::cursorPosition(Font *font, int size, const std::string &text, bool kerning, const Vector2 &boundaries)
-
-    Returns the cursor position for rendering \a text with specified \a font and \a size.
-    Developer can also enable \a kerning and specify a \a boundaries for the text.
-*/
-Vector2 TextRender::cursorPosition(Font *font, int size, const TString &text, bool kerning, const Vector2 &boundaries) {
-    if(font) {
-        float spaceWidth = font->spaceWidth() * size;
-        float spaceLine = font->lineHeight() * size;
-        float cursorMid = font->cursorWidth() * 0.5f * size;
-
-        TString data = Engine::translate(text);
-        font->requestCharacters(data);
-
-        Vector2 pos(0.0, boundaries.y - size);
-
-        uint32_t length = font->length(data);
-        if(length) {
-            std::u32string u32 = data.toUtf32();
-
-            uint32_t previous = 0;
-            uint32_t it = 0;
-
-            for(uint32_t i = 0; i < length; i++) {
-                uint32_t ch = u32[i];
-                switch(ch) {
-                    case ' ': {
-                        pos += Vector2(spaceWidth, 0.0f);
-                    } break;
-                    case '\t': {
-                        pos += Vector2(spaceWidth * 4, 0.0f);
-                    } break;
-                    case '\r': break;
-                    case '\n': {
-                        pos = Vector2(0.0f, pos.y - spaceLine);
-                    } break;
-                    default: {
-                        if(kerning) {
-                            pos.x += font->requestKerning(ch, previous);
-                        }
-                        uint32_t index = font->atlasIndex(ch);
-
-                        Mesh *glyph = font->shape(index);
-                        if(glyph == nullptr) {
-                            continue;
-                        }
-                        Vector3Vector &shape = glyph->vertices();
-
-                        pos += Vector2(shape[2].x * size, 0.0f);
-                        it++;
-                    } break;
-                }
-                previous = ch;
-            }
-        }
-        pos.x -= cursorMid;
-
-        return pos;
-    }
-
-    return Vector2();
-}
 /*!
     \internal
 */
diff --git a/engine/src/editor/editorplatform.cpp b/engine/src/editor/editorplatform.cpp
index 5a897f054..4be1ffb5b 100644
--- a/engine/src/editor/editorplatform.cpp
+++ b/engine/src/editor/editorplatform.cpp
@@ -146,8 +146,6 @@ EditorPlatform &EditorPlatform::instance() {
     static EditorPlatform *instance = nullptr;
     if(instance == nullptr) {
         instance = new EditorPlatform;
-
-        Engine::setPlatformAdaptor(instance);
     }
 
     return *instance;
diff --git a/engine/src/pipelinecontext.cpp b/engine/src/pipelinecontext.cpp
index baee026b7..5f4e43602 100644
--- a/engine/src/pipelinecontext.cpp
+++ b/engine/src/pipelinecontext.cpp
@@ -311,6 +311,23 @@ Mesh *PipelineContext::defaultCube() {
     }
     return cube;
 }
+/*!
+    Return the white texture used in rendering.
+*/
+Texture *PipelineContext::whiteTexture() {
+    static Texture *white = nullptr;
+    if(white == nullptr) {
+        white = Engine::objectCreate<Texture>("white");
+        white->setFormat(Texture::RGBA8);
+
+        Texture::Surface surface;
+        surface.push_back({255, 255, 255, 255});
+
+        white->addSurface(surface);
+        white->setDirty();
+    }
+    return white;
+}
 /*!
     Sets the rendering \a pipeline for the context, creating and linking associated rendering tasks.
 */
diff --git a/engine/src/resources/font.cpp b/engine/src/resources/font.cpp
index 6f289aae0..2cc0f7967 100644
--- a/engine/src/resources/font.cpp
+++ b/engine/src/resources/font.cpp
@@ -107,7 +107,6 @@ Font::Font() :
         m_scale(DF_GLYPH_SIZE),
         m_spaceWidth(0.0f),
         m_lineHeight(0.0f),
-        m_cursorWidth(0.0f),
         m_useKerning(false) {
 
     FT_Init_FreeType( &library );
@@ -203,8 +202,7 @@ int Font::requestKerning(int glyph, int previous) const {
     Returns the number of \a characters in the string.
 */
 int Font::length(const TString &characters) const {
-    std::u32string u32 = characters.toUtf32();
-    return u32.length();
+    return characters.toUtf32().length();
 }
 /*!
     Returns visual width of space character for the font in world units.
@@ -218,11 +216,50 @@ float Font::spaceWidth() const {
 float Font::lineHeight() const {
     return m_lineHeight;
 }
-/*!
-    Returns visual width of the cursor for the font in world units.
-*/
-float Font::cursorWidth() const {
-    return m_cursorWidth;
+
+float Font::textWidth(const TString &text, int size, bool kerning) {
+    TString data = Engine::translate(text);
+    requestCharacters(data);
+
+    float pos = 0;
+
+    uint32_t length = Font::length(data);
+    if(length) {
+        std::u32string u32 = data.toUtf32();
+
+        uint32_t previous = 0;
+        uint32_t it = 0;
+
+        for(uint32_t i = 0; i < length; i++) {
+            uint32_t ch = u32[i];
+            switch(ch) {
+                case ' ': {
+                    pos += m_spaceWidth * size;
+                } break;
+                case '\t': {
+                    pos += m_spaceWidth * size * 4;
+                } break;
+                default: {
+                    if(kerning) {
+                        pos += requestKerning(ch, previous);
+                    }
+                    uint32_t index = atlasIndex(ch);
+
+                    Mesh *glyph = shape(index);
+                    if(glyph == nullptr) {
+                        continue;
+                    }
+                    Vector3Vector &shape = glyph->vertices();
+
+                    pos += shape[2].x * size;
+                    it++;
+                } break;
+            }
+            previous = ch;
+        }
+    }
+
+    return pos;
 }
 
 void Font::composeMesh(Mesh *mesh, const TString &text, int size, int alignment, bool kerning, bool wrap, const Vector2 &boundaries) {
@@ -391,12 +428,6 @@ void Font::loadUserData(const VariantMap &data) {
             if(!error) {
                 m_lineHeight = static_cast<float>(face->glyph->metrics.height) / m_scale / 32.0f;
             }
-
-            error = FT_Load_Glyph( face, FT_Get_Char_Index( face, '|' ), FT_LOAD_DEFAULT );
-            if(!error) {
-                m_cursorWidth = static_cast<float>(face->glyph->advance.x) / m_scale / 64.0f;
-            }
-
         }
     }
 }
diff --git a/modules/editor/grapheditor/editor/graph/graphcontroller.cpp b/modules/editor/grapheditor/editor/graph/graphcontroller.cpp
index a4cd4afae..a22e3d91e 100644
--- a/modules/editor/grapheditor/editor/graph/graphcontroller.cpp
+++ b/modules/editor/grapheditor/editor/graph/graphcontroller.cpp
@@ -242,7 +242,7 @@ void GraphController::update() {
     Qt::CursorShape shape = Qt::ArrowCursor;
     for(auto node : m_graph->nodes()) {
         NodeWidget *widget = static_cast<NodeWidget *>(node->widget());
-        RectTransform *rect = widget->rectTransform();
+        RectTransform *rect = widget->title()->rectTransform();
         if(rect->isHovered(mousePosition.x, mousePosition.y)) {
             hovered = widget;
         }
@@ -365,8 +365,10 @@ void GraphController::update() {
                     }
                 }
 
-                beginDrag();
-                m_dragWidget = hovered;
+                if(Widget::focusWidget() == hovered) {
+                    beginDrag();
+                    m_dragWidget = hovered;
+                }
             } else {
                 m_view->rubberBand()->setEnabled(true);
                 m_view->rubberBand()->raise();
diff --git a/modules/uikit/includes/components/abstractbutton.h b/modules/uikit/includes/components/abstractbutton.h
index 7f05f19a3..a5af406b1 100644
--- a/modules/uikit/includes/components/abstractbutton.h
+++ b/modules/uikit/includes/components/abstractbutton.h
@@ -15,13 +15,10 @@ class UIKIT_EXPORT AbstractButton : public Widget {
         A_PROPERTY(bool, checkable, AbstractButton::isCheckable, AbstractButton::setCheckable),
         A_PROPERTY(bool, checked, AbstractButton::isChecked, AbstractButton::setChecked),
         A_PROPERTY(bool, exclusive, AbstractButton::isExclusive, AbstractButton::setExclusive),
+        A_PROPERTYEX(Vector4, color, AbstractButton::color, AbstractButton::setColor, "editor=Color"),
         A_PROPERTYEX(Frame *, background, AbstractButton::background, AbstractButton::setBackground, "editor=Component"),
         A_PROPERTYEX(Label *, label, AbstractButton::label, AbstractButton::setLabel, "editor=Component"),
-        A_PROPERTYEX(Image *, icon, AbstractButton::icon, AbstractButton::setIcon, "editor=Component"),
-        A_PROPERTY(float, fadeDuration, AbstractButton::fadeDuration, AbstractButton::setFadeDuration),
-        A_PROPERTYEX(Vector4, highlightedColor, AbstractButton::highlightedColor, AbstractButton::setHighlightedColor, "editor=Color"),
-        A_PROPERTYEX(Vector4, normalColor, AbstractButton::normalColor, AbstractButton::setNormalColor, "editor=Color"),
-        A_PROPERTYEX(Vector4, pressedColor, AbstractButton::pressedColor, AbstractButton::setPressedColor, "editor=Color")
+        A_PROPERTYEX(Image *, icon, AbstractButton::icon, AbstractButton::setIcon, "editor=Component")
     )
     A_METHODS(
         A_SIGNAL(AbstractButton::pressed),
@@ -45,19 +42,16 @@ class UIKIT_EXPORT AbstractButton : public Widget {
     void setIcon(Image *image);
 
     Vector2 iconSize() const;
-    void setIconSize(Vector2 size);
+    void setIconSize(const Vector2 &size);
 
-    float fadeDuration() const;
-    void setFadeDuration(float duration);
+    Vector4 color() const;
+    void setColor(const Vector4 &color);
 
     Vector4 highlightedColor() const;
-    void setHighlightedColor(const Vector4 color);
-
-    Vector4 normalColor() const;
-    void setNormalColor(const Vector4 color);
+    void setHighlightedColor(const Vector4 &color);
 
     Vector4 pressedColor() const;
-    void setPressedColor(const Vector4 color);
+    void setPressedColor(const Vector4 &color);
 
     bool isCheckable() const;
     void setCheckable(bool checkable);
@@ -71,6 +65,7 @@ class UIKIT_EXPORT AbstractButton : public Widget {
     bool isMirrored() const;
     virtual void setMirrored(bool mirrored);
 
+public: // signals
     void pressed();
     void clicked();
 
diff --git a/modules/uikit/includes/components/abstractslider.h b/modules/uikit/includes/components/abstractslider.h
new file mode 100644
index 000000000..1f3f09088
--- /dev/null
+++ b/modules/uikit/includes/components/abstractslider.h
@@ -0,0 +1,74 @@
+#ifndef ABSTRACTSLIDER_H
+#define ABSTRACTSLIDER_H
+
+#include "widget.h"
+
+class Frame;
+
+class UIKIT_EXPORT AbstractSlider : public Widget {
+    A_OBJECT(AbstractSlider, Widget, General)
+
+    A_PROPERTIES(
+        A_PROPERTYEX(int, orientation, AbstractSlider::orientation, AbstractSlider::setOrientation, "enum=Orientation"),
+        A_PROPERTY(int, value, AbstractSlider::value, AbstractSlider::setValue),
+        A_PROPERTY(int, minimum, AbstractSlider::minimum, AbstractSlider::setMinimum),
+        A_PROPERTY(int, maximum, AbstractSlider::maximum, AbstractSlider::setMaximum),
+        A_PROPERTYEX(Widget *, knob, AbstractSlider::knob, AbstractSlider::setKnob, "editor=Component")
+    )
+    A_METHODS(
+        A_SIGNAL(AbstractSlider::pressed),
+        A_SIGNAL(AbstractSlider::valueChanged)
+    )
+    A_ENUMS(
+        A_ENUM(Orientation,
+            A_VALUE(Horizontal),
+            A_VALUE(Vertical)
+        )
+    )
+
+public:
+    enum Orientation {
+        Horizontal,
+        Vertical
+    };
+
+public:
+    AbstractSlider();
+
+    int orientation() const;
+    virtual void setOrientation(int orientation);
+
+    int value() const;
+    virtual void setValue(int value);
+
+    int minimum() const;
+    virtual void setMinimum(int minimum);
+
+    int maximum() const;
+    virtual void setMaximum(int maximum);
+
+    Widget *knob() const;
+    void setKnob(Widget *handle);
+
+public: // signals
+    void pressed();
+
+    void valueChanged(int value);
+
+protected:
+    void update() override;
+
+protected:
+    int m_value;
+    int m_minimum;
+    int m_maximum;
+
+    float m_currentFade;
+
+    int m_orientation;
+
+    bool m_hovered;
+
+};
+
+#endif // ABSTRACTSLIDER_H
diff --git a/modules/uikit/includes/components/floatinput.h b/modules/uikit/includes/components/floatinput.h
index a902d813a..c448fc5df 100644
--- a/modules/uikit/includes/components/floatinput.h
+++ b/modules/uikit/includes/components/floatinput.h
@@ -3,7 +3,7 @@
 
 #include "widget.h"
 
-class TextInput;
+class LineEdit;
 class Button;
 
 class UIKIT_EXPORT FloatInput : public Widget {
@@ -17,7 +17,7 @@ class UIKIT_EXPORT FloatInput : public Widget {
         A_PROPERTY(Vector4, corners, FloatInput::corners, FloatInput::setCorners),
         A_PROPERTYEX(Button, increaseButton, FloatInput::increaseButton, FloatInput::setIncreaseButton, "editor=Component"),
         A_PROPERTYEX(Button, decreaseButton, FloatInput::decreaseButton, FloatInput::setDecreaseButton, "editor=Component"),
-        A_PROPERTYEX(TextInput, input, FloatInput::input, FloatInput::setInput, "editor=Component")
+        A_PROPERTYEX(LineEdit, input, FloatInput::input, FloatInput::setInput, "editor=Component")
     )
     A_METHODS(
         A_SLOT(FloatInput::onIncrease),
@@ -49,8 +49,8 @@ class UIKIT_EXPORT FloatInput : public Widget {
     Button *decreaseButton() const;
     void setDecreaseButton(Button *button);
 
-    TextInput *input() const;
-    void setInput(TextInput *input);
+    LineEdit *input() const;
+    void setInput(LineEdit *input);
 
 protected: // slots
     void onIncrease();
diff --git a/modules/uikit/includes/components/frame.h b/modules/uikit/includes/components/frame.h
index a37adfe54..016f72898 100644
--- a/modules/uikit/includes/components/frame.h
+++ b/modules/uikit/includes/components/frame.h
@@ -24,24 +24,24 @@ class UIKIT_EXPORT Frame : public Widget {
     Frame();
 
     Vector4 corners() const;
-    void setCorners(Vector4 corners);
+    void setCorners(const Vector4 &corners);
 
     Vector4 color() const;
-    void setColor(const Vector4 color);
+    void setColor(const Vector4 &color);
 
     Vector4 topColor() const;
-    void setTopColor(Vector4 color);
+    void setTopColor(const Vector4 &color);
 
     Vector4 rightColor() const;
-    void setRightColor(Vector4 color);
+    void setRightColor(const Vector4 &color);
 
     Vector4 bottomColor() const;
-    void setBottomColor(Vector4 color);
+    void setBottomColor(const Vector4 &color);
 
     Vector4 leftColor() const;
-    void setLeftColor(Vector4 color);
+    void setLeftColor(const Vector4 &color);
 
-    void setBorderColor(Vector4 color);
+    void setBorderColor(const Vector4 &color);
 
 protected:
     void boundChanged(const Vector2 &size) override;
diff --git a/modules/uikit/includes/components/lineedit.h b/modules/uikit/includes/components/lineedit.h
new file mode 100644
index 000000000..ff4fa18ec
--- /dev/null
+++ b/modules/uikit/includes/components/lineedit.h
@@ -0,0 +1,80 @@
+#ifndef LINEEDIT_H
+#define LINEEDIT_H
+
+#include "frame.h"
+
+class Label;
+
+class UIKIT_EXPORT LineEdit : public Frame {
+    A_OBJECT(LineEdit, Frame, Components/UI)
+
+    A_PROPERTIES(
+        A_PROPERTY(TString, text, LineEdit::text, LineEdit::setText),
+        A_PROPERTYEX(Vector4, textColor, LineEdit::textColor, LineEdit::setTextColor, "editor=Color"),
+        A_PROPERTYEX(Label *, textComponent, LineEdit::textComponent, LineEdit::setTextComponent, "editor=Component")
+    )
+    A_METHODS(
+        A_SIGNAL(LineEdit::focusIn),
+        A_SIGNAL(LineEdit::focusOut),
+        A_SIGNAL(LineEdit::editingFinished)
+    )
+    A_NOENUMS()
+
+public:
+    LineEdit();
+
+    TString text() const;
+    void setText(const TString &text);
+
+    Vector4 textColor() const;
+    void setTextColor(const Vector4 &color);
+
+    Label *textComponent() const;
+    void setTextComponent(Label *label);
+
+public: // signals
+    void focusIn();
+    void focusOut();
+
+    void editingFinished();
+
+protected:
+    void update() override;
+
+    void composeComponent() override;
+
+    void recalcCursor();
+
+private:
+    void drawSub(CommandBuffer &buffer) override;
+
+private:
+    TString m_text;
+
+    Vector4 m_normalColor;
+    Vector4 m_highlightedColor;
+    Vector4 m_pressedColor;
+
+    Vector4 m_textColor;
+
+    Matrix4 m_cursorTransform;
+
+    Mesh *m_cursor;
+
+    MaterialInstance *m_cursorMaterial;
+
+    int32_t m_cursorPosition;
+
+    float m_fadeDuration;
+    float m_currentFade;
+    float m_cursorBlinkRate;
+    float m_cursorBlinkCurrent;
+    float m_cursorRepeatHold;
+
+    bool m_hovered;
+    bool m_focused;
+    bool m_cursorVisible;
+
+};
+
+#endif // LINEEDIT_H
diff --git a/modules/uikit/includes/components/progressbar.h b/modules/uikit/includes/components/progressbar.h
index 704fe32c1..4dda83b47 100644
--- a/modules/uikit/includes/components/progressbar.h
+++ b/modules/uikit/includes/components/progressbar.h
@@ -7,6 +7,7 @@ class UIKIT_EXPORT ProgressBar : public Widget {
     A_OBJECT(ProgressBar, Widget, Components/UI)
 
     A_PROPERTIES(
+        A_PROPERTYEX(int, orientation, ProgressBar::orientation, ProgressBar::setOrientation, "enum=Orientation"),
         A_PROPERTY(float, from, ProgressBar::from, ProgressBar::setFrom),
         A_PROPERTY(float, to, ProgressBar::to, ProgressBar::setTo),
         A_PROPERTY(float, value, ProgressBar::value, ProgressBar::setValue),
@@ -16,11 +17,25 @@ class UIKIT_EXPORT ProgressBar : public Widget {
         A_PROPERTYEX(Frame *, chunk, ProgressBar::chunk, ProgressBar::setChunk, "editor=Component")
     )
     A_NOMETHODS()
-    A_NOENUMS()
+    A_ENUMS(
+        A_ENUM(Orientation,
+            A_VALUE(Horizontal),
+            A_VALUE(Vertical)
+        )
+    )
+
+public:
+    enum Orientation {
+        Horizontal,
+        Vertical
+    };
 
 public:
     ProgressBar();
 
+    int orientation() const;
+    void setOrientation(int orientation);
+
     float from() const;
     void setFrom(float value);
 
@@ -51,6 +66,8 @@ class UIKIT_EXPORT ProgressBar : public Widget {
     Vector4 m_backgroundColor;
     Vector4 m_progressColor;
 
+    int m_orientation;
+
     float m_from;
     float m_to;
     float m_value;
diff --git a/modules/uikit/includes/components/recttransform.h b/modules/uikit/includes/components/recttransform.h
index 65d8e6ba2..605494f1c 100644
--- a/modules/uikit/includes/components/recttransform.h
+++ b/modules/uikit/includes/components/recttransform.h
@@ -81,6 +81,8 @@ class UIKIT_EXPORT RectTransform : public Transform {
 
     Vector2 sizeHint() const;
 
+    Vector4 scissorArea() const;
+
 private:
     friend class Layout;
 
diff --git a/modules/uikit/includes/components/slider.h b/modules/uikit/includes/components/slider.h
new file mode 100644
index 000000000..c2b01b15b
--- /dev/null
+++ b/modules/uikit/includes/components/slider.h
@@ -0,0 +1,35 @@
+#ifndef SLIDER_H
+#define SLIDER_H
+
+#include "abstractslider.h"
+
+class ProgressBar;
+
+class UIKIT_EXPORT Slider : public AbstractSlider {
+    A_OBJECT(Slider, AbstractSlider, Components/UI)
+
+public:
+    Slider();
+
+    ProgressBar *background() const;
+    void setBackground(ProgressBar *background);
+
+    void setValue(int value) override;
+    void setMinimum(int value) override;
+    void setMaximum(int value) override;
+
+    void setOrientation(int value) override;
+
+private:
+    void update() override;
+
+    void composeComponent() override;
+
+private:
+    Vector4 m_normalColor;
+
+    Vector4 m_highlightedColor;
+
+};
+
+#endif // SLIDER_H
diff --git a/modules/uikit/includes/components/textinput.h b/modules/uikit/includes/components/textinput.h
deleted file mode 100644
index 41101e4cf..000000000
--- a/modules/uikit/includes/components/textinput.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef TEXTINPUT_H
-#define TEXTINPUT_H
-
-#include "widget.h"
-
-class Label;
-class Frame;
-
-class UIKIT_EXPORT TextInput : public Widget {
-    A_OBJECT(TextInput, Widget, Components/UI)
-
-    A_PROPERTIES(
-        A_PROPERTY(TString, text, TextInput::text, TextInput::setText),
-        A_PROPERTYEX(Vector4, textColor, TextInput::textColor, TextInput::setTextColor, "editor=Color"),
-        A_PROPERTYEX(Vector4, backgroundColor, TextInput::backgroundColor, TextInput::setBackgroundColor, "editor=Color"),
-        A_PROPERTYEX(Vector4, hoverColor, TextInput::hoverColor, TextInput::setHoverColor, "editor=Color"),
-        A_PROPERTYEX(Vector4, pressedColor, TextInput::pressedColor, TextInput::setPressedColor, "editor=Color"),
-        A_PROPERTYEX(Label *, textComponent, TextInput::textComponent, TextInput::setTextComponent, "editor=Component"),
-        A_PROPERTYEX(Frame *, background, TextInput::background, TextInput::setBackground, "editor=Component")
-    )
-    A_METHODS(
-        A_SIGNAL(TextInput::focusIn),
-        A_SIGNAL(TextInput::focusOut),
-        A_SIGNAL(TextInput::editingFinished)
-    )
-    A_NOENUMS()
-
-public:
-    TextInput();
-
-    TString text() const;
-    void setText(const TString text);
-
-    Vector4 textColor() const;
-    void setTextColor(Vector4 color);
-
-    Vector4 backgroundColor() const;
-    void setBackgroundColor(Vector4 color);
-
-    Vector4 hoverColor() const;
-    void setHoverColor(Vector4 color);
-
-    Vector4 pressedColor() const;
-    void setPressedColor(Vector4 color);
-
-    Frame *background() const;
-    void setBackground(Frame *frame);
-
-    Label *textComponent() const;
-    void setTextComponent(Label *label);
-
-    Label *textCursor() const;
-    void setTextCursor(Label *cursor);
-
-public: // signals
-    void focusIn();
-    void focusOut();
-
-    void editingFinished();
-
-protected:
-    void update() override;
-
-    void composeComponent() override;
-
-    void recalcCursor();
-
-private:
-    Vector4 m_normalColor;
-    Vector4 m_highlightedColor;
-    Vector4 m_pressedColor;
-
-    Vector4 m_textColor;
-
-    int32_t m_cursorPosition;
-
-    float m_fadeDuration;
-    float m_currentFade;
-    float m_cursorBlinkRate;
-    float m_cursorBlinkCurrent;
-
-    bool m_hovered;
-    bool m_focused;
-
-};
-
-#endif // TEXTINPUT_H
diff --git a/modules/uikit/includes/components/widget.h b/modules/uikit/includes/components/widget.h
index aae0db427..0a9818f89 100644
--- a/modules/uikit/includes/components/widget.h
+++ b/modules/uikit/includes/components/widget.h
@@ -28,7 +28,7 @@ class UIKIT_EXPORT Widget : public NativeBehaviour {
     void addClass(const TString &name);
 
     Widget *parentWidget() const;
-    std::list<Widget *> childWidgets() const;
+    std::list<Widget *> &childWidgets();
 
     RectTransform *rectTransform() const;
 
@@ -44,6 +44,8 @@ class UIKIT_EXPORT Widget : public NativeBehaviour {
 protected:
     virtual void draw(CommandBuffer &buffer);
 
+    virtual void drawSub(CommandBuffer &buffer);
+
     virtual void boundChanged(const Vector2 &size);
 
     virtual void applyStyle();
@@ -63,7 +65,7 @@ class UIKIT_EXPORT Widget : public NativeBehaviour {
     Vector4 styleBlock4Length(const TString &property, const Vector4 &value, bool &pixels);
 
     Widget *subWidget(const TString &name) const;
-    void setSubWidget(const TString &name, Widget *widget);
+    void setSubWidget(Widget *widget);
 
     static void setFocusWidget(Widget *widget);
 
@@ -75,7 +77,9 @@ class UIKIT_EXPORT Widget : public NativeBehaviour {
 protected:
     std::map<TString, std::pair<uint32_t, TString>> m_styleRules;
 
-    std::map<TString, Widget *> m_subWidgets;
+    std::list<Widget *> m_subWidgets;
+
+    std::list<Widget *> m_childWidgets;
 
 private:
     friend class GuiLayer;
diff --git a/modules/uikit/src/components/abstractbutton.cpp b/modules/uikit/src/components/abstractbutton.cpp
index ede5897ff..e18941a19 100644
--- a/modules/uikit/src/components/abstractbutton.cpp
+++ b/modules/uikit/src/components/abstractbutton.cpp
@@ -14,7 +14,7 @@
 #include <timer.h>
 #include <log.h>
 
-namespace  {
+namespace {
     const char *gBackground("background");
     const char *gLabel("label");
     const char *gIcon("icon");
@@ -24,6 +24,7 @@ namespace  {
     const char *gLabelClass("Label");
 
     const float gCorner = 4.0f;
+    const float gFadeDuration = 0.2f;
 }
 /*!
     \class AbstractButton
@@ -42,7 +43,6 @@ AbstractButton::AbstractButton() :
         m_pressedColor(Vector4(0.7f, 0.7f, 0.7f, 1.0f)),
         m_textColor(Vector4(1.0f, 1.0f, 1.0f, 1.0f)),
         m_iconSize(16.0f),
-        m_fadeDuration(0.2f),
         m_currentFade(1.0f),
         m_hovered(false),
         m_mirrored(false),
@@ -80,7 +80,7 @@ Frame *AbstractButton::background() const {
     Sets the background \a frame of the button.
 */
 void AbstractButton::setBackground(Frame *frame) {
-    setSubWidget(gBackground, frame);
+    setSubWidget(frame);
 
     if(frame) {
         frame->setColor(m_normalColor);
@@ -96,7 +96,7 @@ Label *AbstractButton::label() const {
     Sets the \a label associated with the button.
 */
 void AbstractButton::setLabel(Label *label) {
-    setSubWidget(gLabel, label);
+    setSubWidget(label);
 }
 /*!
      Returns the icon associated with the button.
@@ -108,7 +108,7 @@ Image *AbstractButton::icon() const {
     Sets the icon \a image associated with the button.
 */
 void AbstractButton::setIcon(Image *image) {
-    setSubWidget(gIcon, image);
+    setSubWidget(image);
 
     if(image) {
         RectTransform *rect = image->rectTransform();
@@ -127,7 +127,7 @@ Vector2 AbstractButton::iconSize() const {
 /*!
     Sets the \a size of the icon.
 */
-void AbstractButton::setIconSize(Vector2 size) {
+void AbstractButton::setIconSize(const Vector2 &size) {
     m_iconSize = size;
     Image *img = icon();
     if(img) {
@@ -135,16 +135,20 @@ void AbstractButton::setIconSize(Vector2 size) {
     }
 }
 /*!
-    Returns the fade duration used for visual effects.
+    Returns the normal color of the button.
 */
-float AbstractButton::fadeDuration() const {
-    return m_fadeDuration;
+Vector4 AbstractButton::color() const {
+    return m_normalColor;
 }
 /*!
-    Sets the fade \a duration used for visual effects.
+    Sets the normal \a color of the button.
 */
-void AbstractButton::setFadeDuration(float duration) {
-    m_fadeDuration = duration;
+void AbstractButton::setColor(const Vector4 &color) {
+    m_normalColor = color;
+    Frame *back = background();
+    if(back) {
+        back->setColor(m_normalColor);
+    }
 }
 /*!
     Returns the color used when the button is highlighted.
@@ -155,25 +159,9 @@ Vector4 AbstractButton::highlightedColor() const {
 /*!
     Sets the \a color used when the button is highlighted.
 */
-void AbstractButton::setHighlightedColor(const Vector4 color) {
+void AbstractButton::setHighlightedColor(const Vector4 &color) {
     m_highlightedColor = color;
 }
-/*!
-    Returns the normal color of the button.
-*/
-Vector4 AbstractButton::normalColor() const {
-    return m_normalColor;
-}
-/*!
-    Sets the normal \a color of the button.
-*/
-void AbstractButton::setNormalColor(const Vector4 color) {
-    m_normalColor = color;
-    Frame *back = background();
-    if(back) {
-        back->setColor(m_normalColor);
-    }
-}
 /*!
     Returns the color used when the button is pressed.
 */
@@ -183,7 +171,7 @@ Vector4 AbstractButton::pressedColor() const {
 /*!
     Sets the \a color used when the button is pressed.
 */
-void AbstractButton::setPressedColor(const Vector4 color) {
+void AbstractButton::setPressedColor(const Vector4 &color) {
     m_pressedColor = color;
 }
 /*!
@@ -298,7 +286,7 @@ void AbstractButton::applyStyle() {
     // Background color
     auto it = m_styleRules.find("background-color");
     if(it != m_styleRules.end()) {
-        setNormalColor(StyleSheet::toColor(it->second.second));
+        setColor(StyleSheet::toColor(it->second.second));
     }
 }
 /*!
@@ -326,14 +314,14 @@ void AbstractButton::composeComponent() {
     Widget::composeComponent();
 
     // Add background
-    Actor *background = Engine::composeActor(gFrameClass, "Background", actor());
+    Actor *background = Engine::composeActor(gFrameClass, gBackground, actor());
     Frame *frame = background->getComponent<Frame>();
     frame->setCorners(Vector4(gCorner));
 
     setBackground(frame);
 
     // Add label
-    Actor *text = Engine::composeActor(gLabelClass, gLabelClass, actor());
+    Actor *text = Engine::composeActor(gLabelClass, gLabel, actor());
     Label *label = text->getComponent<Label>();
     label->setAlign(Alignment::Middle | Alignment::Center);
     label->setColor(m_textColor);
@@ -346,7 +334,7 @@ void AbstractButton::composeComponent() {
     setText("Text");
 
     // Add icon
-    Actor *icon = Engine::composeActor(gImageClass, gImageClass, actor());
+    Actor *icon = Engine::composeActor(gImageClass, gIcon, actor());
     Image *image = icon->getComponent<Image>();
 
     setIcon(image);
diff --git a/modules/uikit/src/components/abstractslider.cpp b/modules/uikit/src/components/abstractslider.cpp
new file mode 100644
index 000000000..df9a69385
--- /dev/null
+++ b/modules/uikit/src/components/abstractslider.cpp
@@ -0,0 +1,69 @@
+#include "components/abstractslider.h"
+
+#include "components/recttransform.h"
+#include "components/frame.h"
+
+#include <input.h>
+
+namespace {
+    const char *gKnob("knob");
+
+    const char *gFrameClass("Frame");
+}
+
+AbstractSlider::AbstractSlider() :
+        m_value(2),
+        m_minimum(0),
+        m_maximum(10),
+        m_currentFade(1.0f),
+        m_orientation(Horizontal),
+        m_hovered(false) {
+
+}
+
+int AbstractSlider::orientation() const {
+    return m_orientation;
+}
+
+void AbstractSlider::setOrientation(int orientation) {
+    m_orientation = orientation;
+}
+
+int AbstractSlider::value() const {
+    return m_value;
+}
+
+void AbstractSlider::setValue(int value) {
+    if(m_value != value) {
+        m_value = value;
+
+        emitSignal(_SIGNAL(valueChanged), m_value);
+    }
+}
+
+int AbstractSlider::minimum() const {
+    return m_minimum;
+}
+
+void AbstractSlider::setMinimum(int minimum) {
+    m_minimum = minimum;
+}
+
+int AbstractSlider::maximum() const {
+    return m_maximum;
+}
+
+void AbstractSlider::setMaximum(int maximum) {
+    m_maximum = maximum;
+}
+
+Widget *AbstractSlider::knob() const {
+    return static_cast<Widget *>(subWidget(gKnob));
+}
+
+void AbstractSlider::setKnob(Widget *handle) {
+    setSubWidget(handle);
+}
+
+void AbstractSlider::update() {
+}
diff --git a/modules/uikit/src/components/checkbox.cpp b/modules/uikit/src/components/checkbox.cpp
index 4f6d6e4cd..5c8ed4066 100644
--- a/modules/uikit/src/components/checkbox.cpp
+++ b/modules/uikit/src/components/checkbox.cpp
@@ -39,7 +39,7 @@ Image *CheckBox::knobGraphic() const {
     Sets the graphical \a knob component.
 */
 void CheckBox::setKnobGraphic(Image *knob) {
-    setSubWidget(gKnob, knob);
+    setSubWidget(knob);
 
     if(knob) {
         knob->setColor(m_knobColor);
@@ -113,7 +113,7 @@ void CheckBox::composeComponent() {
         }
 
         // Add knob
-        Actor *knob = Engine::composeActor("Image", "Knob", background()->actor());
+        Actor *knob = Engine::composeActor("Image", gKnob, background()->actor());
         Image *image = knob->getComponent<Image>();
         if(image) {
             Sprite *ui = Engine::loadResource<Sprite>(".embedded/ui.png");
diff --git a/modules/uikit/src/components/floatinput.cpp b/modules/uikit/src/components/floatinput.cpp
index ab66bccd4..67a61efd8 100644
--- a/modules/uikit/src/components/floatinput.cpp
+++ b/modules/uikit/src/components/floatinput.cpp
@@ -3,7 +3,7 @@
 #include "components/layout.h"
 #include "components/recttransform.h"
 #include "components/button.h"
-#include "components/textinput.h"
+#include "components/lineedit.h"
 #include "components/label.h"
 #include "components/frame.h"
 #include "components/image.h"
@@ -19,7 +19,7 @@ namespace {
     const char *gDecrease("decrease");
     const char *gInput("input");
 
-    const char *gTextInputClass("TextInput");
+    const char *gLineEditClass("LineEdit");
     const char *gButtonClass("Button");
 };
 
@@ -52,7 +52,7 @@ void FloatInput::setValue(float value) {
 
     std::ostringstream ss;
     ss << m_value;
-    TextInput *text = input();
+    LineEdit *text = static_cast<LineEdit *>(subWidget(gInput));
     if(text) {
         text->setText(ss.str());
     }
@@ -145,7 +145,7 @@ Button *FloatInput::increaseButton() const {
     Sets the increase value \a button.
 */
 void FloatInput::setIncreaseButton(Button *button) {
-    setSubWidget(gIncrease, button);
+    setSubWidget(button);
 }
 /*!
     Returns the decrease value button.
@@ -157,19 +157,19 @@ Button *FloatInput::decreaseButton() const {
     Sets the decrease value \a button.
 */
 void FloatInput::setDecreaseButton(Button *button) {
-    setSubWidget(gDecrease, button);
+    setSubWidget(button);
 }
 /*!
     Returns the input field component.
 */
-TextInput *FloatInput::input() const {
-    return static_cast<TextInput *>(subWidget(gInput));
+LineEdit *FloatInput::input() const {
+    return static_cast<LineEdit *>(subWidget(gInput));
 }
 /*!
     Sets the \a input field component.
 */
-void FloatInput::setInput(TextInput *input) {
-    setSubWidget(gInput, input);
+void FloatInput::setInput(LineEdit *input) {
+    setSubWidget(input);
 }
 /*!
     Slot method called when the increase button is clicked. Increments the FloatInput value.
@@ -187,7 +187,7 @@ void FloatInput::onDecrease() {
     Slot method called when editing of the input text is finished. Updates the FloatInput value based on the entered text.
 */
 void FloatInput::onEditingFinished() {
-    TextInput *current = input();
+    LineEdit *current = input();
     if(current) {
         TString text = current->text();
         if(!text.isEmpty()) {
@@ -206,9 +206,9 @@ void FloatInput::composeComponent() {
 
     const float width = 20.0f;
 
-    Actor *text = Engine::composeActor(gTextInputClass, gTextInputClass, actor());
+    Actor *text = Engine::composeActor(gLineEditClass, gInput, actor());
 
-    TextInput *input = static_cast<TextInput *>(text->component(gTextInputClass));
+    LineEdit *input = text->getComponent<LineEdit>();
     if(input) {
         connect(input, _SIGNAL(focusOut()), this, _SLOT(onEditingFinished()));
         connect(input, _SIGNAL(editingFinished()), this, _SLOT(onEditingFinished()));
@@ -223,7 +223,7 @@ void FloatInput::composeComponent() {
 
     Sprite *arrow = Engine::loadResource<Sprite>(".embedded/ui.png");
 
-    Actor *left = Engine::composeActor(gButtonClass, "Decrease", actor());
+    Actor *left = Engine::composeActor(gButtonClass, gDecrease, actor());
     Button *decreaseBtn = static_cast<Button *>(left->component(gButtonClass));
     if(decreaseBtn) {
         connect(decreaseBtn, _SIGNAL(clicked()), this, _SLOT(onDecrease()));
diff --git a/modules/uikit/src/components/foldout.cpp b/modules/uikit/src/components/foldout.cpp
index e94dad323..2b3b29927 100644
--- a/modules/uikit/src/components/foldout.cpp
+++ b/modules/uikit/src/components/foldout.cpp
@@ -110,7 +110,7 @@ Frame *Foldout::container() const {
     Sets \a container component attached to this widget.
 */
 void Foldout::setContainer(Frame *container) {
-    setSubWidget(gContainer, container);
+    setSubWidget(container);
 }
 /*!
     Returns indicator button to fold and unfold container with content.
@@ -122,7 +122,7 @@ Button *Foldout::indicator() const {
     Sets \a indicator button to fold and unfold container with content.
 */
 void Foldout::setIndicator(Button *indicator) {
-    setSubWidget(gIndicator, indicator);
+    setSubWidget(indicator);
 }
 /*!
     Returns a text label represents foldout header.
@@ -134,7 +134,7 @@ Label *Foldout::label() const {
     Sets a text \a label represents foldout header.
 */
 void Foldout::setLabel(Label *label) {
-    setSubWidget(gLabel, label);
+    setSubWidget(label);
 }
 /*!
     Toggles the expanded state of the foldout when the indicator is clicked.
@@ -148,7 +148,7 @@ void Foldout::onExpand() {
 void Foldout::composeComponent() {
     Widget::composeComponent();
 
-    Actor *containerActor = Engine::composeActor(gFrameClass, "Container", actor());
+    Actor *containerActor = Engine::composeActor(gFrameClass, gContainer, actor());
     Frame *container = containerActor->getComponent<Frame>();
     container->setColor(Vector4(0.0f, 0.0f, 0.0f, 0.25f));
     setContainer(container);
@@ -161,12 +161,12 @@ void Foldout::composeComponent() {
     Layout *containerLayout = new Layout;
     containerRect->setLayout(containerLayout);
 
-    Actor *indicatorActor = Engine::composeActor(gButtonClass, "Indicator", actor());
+    Actor *indicatorActor = Engine::composeActor(gButtonClass, gIndicator, actor());
     Button *indicator = indicatorActor->getComponent<Button>();
 
     indicator->setText("");
     indicator->setIconSize(Vector2(16.0f, 8.0f));
-    indicator->setNormalColor(Vector4(1.0f, 1.0f, 1.0f, 0.0f));
+    indicator->setColor(Vector4(1.0f, 1.0f, 1.0f, 0.0f));
     setIndicator(indicator);
 
     Image *icon = indicator->icon();
@@ -180,7 +180,7 @@ void Foldout::composeComponent() {
     RectTransform *indicatorRect = indicator->rectTransform();
     indicatorRect->setSize(20);
 
-    Actor *labelActor = Engine::composeActor(gLabelClass, gLabelClass, actor());
+    Actor *labelActor = Engine::composeActor(gLabelClass, gLabel, actor());
     Label *label = labelActor->getComponent<Label>();
     label->setAlign(Alignment::Top | Alignment::Left);
     setLabel(label);
diff --git a/modules/uikit/src/components/frame.cpp b/modules/uikit/src/components/frame.cpp
index 9447ef61c..e70e894fc 100644
--- a/modules/uikit/src/components/frame.cpp
+++ b/modules/uikit/src/components/frame.cpp
@@ -77,6 +77,8 @@ void Frame::draw(CommandBuffer &buffer) {
 
         buffer.drawMesh(m_mesh, 0, Material::Translucent, *m_material);
     }
+
+    Widget::draw(buffer);
 }
 /*!
     \internal
@@ -138,7 +140,7 @@ Vector4 Frame::corners() const {
 /*!
     Sets the \a corners radiuses of the frame.
 */
-void Frame::setCorners(Vector4 corners) {
+void Frame::setCorners(const Vector4 &corners) {
     m_borderRadius = corners;
     if(m_material) {
         RectTransform *rect = rectTransform();
@@ -155,7 +157,7 @@ Vector4 Frame::color() const {
 /*!
     Changes the \a color of the frame to be drawn.
 */
-void Frame::setColor(const Vector4 color) {
+void Frame::setColor(const Vector4 &color) {
     m_backgroundColor = color;
     if(m_material) {
         m_material->setVector4(gBackgroundColor, &m_backgroundColor);
@@ -170,7 +172,7 @@ Vector4 Frame::topColor() const {
 /*!
     Sets the top border \a color of the frame.
 */
-void Frame::setTopColor(Vector4 color) {
+void Frame::setTopColor(const Vector4 &color) {
     m_topColor = color;
     if(m_material) {
         m_material->setVector4(gTopColor, &m_topColor);
@@ -185,7 +187,7 @@ Vector4 Frame::rightColor() const {
 /*!
     Sets the right border \a color of the frame.
 */
-void Frame::setRightColor(Vector4 color) {
+void Frame::setRightColor(const Vector4 &color) {
     m_rightColor = color;
     if(m_material) {
         m_material->setVector4(gRightColor, &m_rightColor);
@@ -200,7 +202,7 @@ Vector4 Frame::bottomColor() const {
 /*!
     Sets the bottom border \a color of the frame.
 */
-void Frame::setBottomColor(Vector4 color) {
+void Frame::setBottomColor(const Vector4 &color) {
     m_bottomColor = color;
     if(m_material) {
         m_material->setVector4(gBottomColor, &m_bottomColor);
@@ -215,7 +217,7 @@ Vector4 Frame::leftColor() const {
 /*!
     Sets the left border \a color of the frame.
 */
-void Frame::setLeftColor(Vector4 color) {
+void Frame::setLeftColor(const Vector4 &color) {
     m_leftColor = color;
     if(m_material) {
         m_material->setVector4(gLeftColor, &m_leftColor);
@@ -224,7 +226,7 @@ void Frame::setLeftColor(Vector4 color) {
 /*!
     Sets the border \a color of the frame.
 */
-void Frame::setBorderColor(Vector4 color) {
+void Frame::setBorderColor(const Vector4 &color) {
     setTopColor(color);
     setRightColor(color);
     setBottomColor(color);
diff --git a/modules/uikit/src/components/image.cpp b/modules/uikit/src/components/image.cpp
index 689c6bedb..b59e72d30 100644
--- a/modules/uikit/src/components/image.cpp
+++ b/modules/uikit/src/components/image.cpp
@@ -84,6 +84,8 @@ void Image::draw(CommandBuffer &buffer) {
     m_material->setTransform(rectTransform());
 
     buffer.drawMesh(m_mesh, 0, Material::Translucent, *m_material);
+
+    Widget::draw(buffer);
 }
 /*!
     Returns an instantiated Material assigned to Image.
diff --git a/modules/uikit/src/components/label.cpp b/modules/uikit/src/components/label.cpp
index ee11b5713..e9b8cf441 100644
--- a/modules/uikit/src/components/label.cpp
+++ b/modules/uikit/src/components/label.cpp
@@ -79,6 +79,8 @@ void Label::draw(CommandBuffer &buffer) {
 
         buffer.drawMesh(m_mesh, 0, Material::Translucent, *m_material);
     }
+
+    Widget::draw(buffer);
 }
 /*!
     \internal
@@ -239,7 +241,7 @@ void Label::setKerning(const bool kerning) {
 */
 Vector2 Label::cursorAt(int position) {
     std::u32string u32 = m_text.toUtf32();
-    return TextRender::cursorPosition(m_font, m_size, TString::fromUtf32(u32.substr(0, position)), m_kerning, m_meshSize);
+    return Vector2(m_font->textWidth(TString::fromUtf32(u32.substr(0, position)), m_size, m_kerning), 0.0f);
 }
 /*!
     \internal
diff --git a/modules/uikit/src/components/lineedit.cpp b/modules/uikit/src/components/lineedit.cpp
new file mode 100644
index 000000000..bcd01a003
--- /dev/null
+++ b/modules/uikit/src/components/lineedit.cpp
@@ -0,0 +1,312 @@
+#include "components/lineedit.h"
+
+#include "components/label.h"
+#include "components/frame.h"
+#include "components/recttransform.h"
+
+#include <components/actor.h>
+
+#include <resources/mesh.h>
+#include <resources/font.h>
+
+#include <input.h>
+#include <timer.h>
+#include <commandbuffer.h>
+#include <pipelinecontext.h>
+
+#include <algorithm>
+
+#define HOLD_TIME 0.1f
+
+namespace {
+    const char *gText("text");
+
+    const char *gLabelClass("Label");
+    const char *gFrameClass("Frame");
+}
+
+/*!
+    \class TextInput
+    \brief The TextInput class is a UI component that allows users to input text.
+    \inmodule Gui
+
+    The TextInput class provides a user interface for text input, supporting text editing, cursor positioning, and input handling.
+    It inherits functionality from the Widget class and extends it to handle text-related features and animations.
+*/
+
+LineEdit::LineEdit() :
+        m_normalColor(0.5f, 0.5f, 0.5f, 1.0f),
+        m_highlightedColor(0.6f, 0.6f, 0.6f, 1.0f),
+        m_pressedColor(0.7f, 0.7f, 0.7f, 1.0f),
+        m_textColor(1.0f, 1.0f, 1.0f, 1.0f),
+        m_cursor(PipelineContext::defaultPlane()),
+        m_cursorPosition(0),
+        m_fadeDuration(0.2f),
+        m_currentFade(1.0f),
+        m_cursorBlinkRate(0.85f),
+        m_cursorBlinkCurrent(0.0f),
+        m_cursorRepeatHold(0.0f),
+        m_hovered(false),
+        m_focused(false),
+        m_cursorVisible(false) {
+
+    Material *material = Engine::loadResource<Material>(".embedded/DefaultSprite.shader");
+    if(material) {
+        m_cursorMaterial = material->createInstance();
+        m_cursorMaterial->setTexture("mainTexture", PipelineContext::whiteTexture());
+    }
+
+    m_cursorTransform.scale(Vector3(2.0f, 16.0f, 1.0f));
+}
+/*!
+    \internal
+*/
+void LineEdit::drawSub(CommandBuffer &buffer) {
+    RectTransform *rect = rectTransform();
+    Vector4 scissor(rect->scissorArea());
+    buffer.enableScissor(scissor.x, scissor.y, scissor.z, scissor.w);
+
+    Widget::drawSub(buffer);
+
+    if(m_cursorVisible && m_cursorMaterial) {
+        m_cursorMaterial->setTransform(rect->worldTransform() * m_cursorTransform);
+        buffer.drawMesh(m_cursor, 0, Material::Translucent, *m_cursorMaterial);
+    }
+
+    buffer.disableScissor();
+}
+
+/*!
+    Returns the current text entered into the TextInput.
+*/
+TString LineEdit::text() const {
+    return m_text;
+}
+/*!
+    Sets the \a text in the TextInput.
+*/
+void LineEdit::setText(const TString &text) {
+    Label *label = textComponent();
+    if(label) {
+        m_text = text;
+        label->setText(m_text);
+        if(m_cursorPosition == 0) {
+            m_cursorPosition = m_text.toUtf32().size();
+            recalcCursor();
+        }
+    }
+}
+/*!
+    Returns the color of the text.
+*/
+Vector4 LineEdit::textColor() const {
+    return m_textColor;
+}
+/*!
+    Sets the \a color of the text.
+*/
+void LineEdit::setTextColor(const Vector4 &color) {
+    m_textColor = color;
+
+    Label *label = textComponent();
+    if(label) {
+        label->setColor(m_textColor);
+    }
+}
+/*!
+    Returns the text label component.
+*/
+Label *LineEdit::textComponent() const {
+    return static_cast<Label *>(subWidget(gText));
+}
+/*!
+    Sets the text \a label component.
+*/
+void LineEdit::setTextComponent(Label *label) {
+    setSubWidget(label);
+}
+/*!
+    \internal
+    Overrides the update method to handle text input and cursor animation.
+*/
+void LineEdit::update() {
+    Vector4 pos = Input::mousePosition();
+    if(Input::touchCount() > 0) {
+        pos = Input::touchPosition(0);
+    }
+    Vector4 color(m_normalColor);
+
+    if(Widget::focusWidget() == this) {
+        bool breakCursorFlashing = false;
+
+        std::u32string u32 = m_text.toUtf32();
+        if(Input::isKey(Input::KEY_BACKSPACE) || Input::isKey(Input::KEY_DELETE)) {
+            breakCursorFlashing = true;
+            if(m_cursorRepeatHold < 0.0f) {
+                if(Input::isKey(Input::KEY_BACKSPACE) && m_cursorPosition >= 0) {
+                    m_cursorPosition--;
+                }
+                if(m_cursorPosition >= 0) {
+                    u32.erase(m_cursorPosition, 1);
+                    setText(TString::fromUtf32(u32));
+                } else {
+                    m_cursorPosition = 0;
+                }
+                recalcCursor();
+
+                m_cursorRepeatHold = HOLD_TIME;
+            } else {
+                m_cursorRepeatHold -= Timer::deltaTime();
+            }
+        } else if(Input::isKeyUp(Input::KEY_BACKSPACE) || Input::isKeyUp(Input::KEY_DELETE)) {
+            m_cursorRepeatHold = 0.0f;
+        }
+
+        if(Input::isKey(Input::KEY_LEFT) && m_cursorPosition > 0) {
+            breakCursorFlashing = true;
+            if(m_cursorRepeatHold < 0.0f) {
+                m_cursorPosition--;
+                recalcCursor();
+
+                m_cursorRepeatHold = HOLD_TIME;
+            } else {
+                m_cursorRepeatHold -= Timer::deltaTime();
+            }
+        } else if(Input::isKeyUp(Input::KEY_LEFT)) {
+            m_cursorRepeatHold = 0.0f;
+        }
+
+        if(Input::isKey(Input::KEY_RIGHT) && m_cursorPosition < u32.size()) {
+            breakCursorFlashing = true;
+            if(m_cursorRepeatHold < 0.0f) {
+                m_cursorPosition++;
+                recalcCursor();
+
+                m_cursorRepeatHold = HOLD_TIME;
+            } else {
+                m_cursorRepeatHold -= Timer::deltaTime();
+            }
+        } else if(Input::isKeyUp(Input::KEY_RIGHT)){
+            m_cursorRepeatHold = 0.0f;
+        }
+
+        if(Input::isKeyDown(Input::KEY_ENTER) || Input::isKeyDown(Input::KEY_KP_ENTER)) {
+            emitSignal(_SIGNAL(editingFinished()));
+        } else {
+            TString sub = Input::inputString();
+            std::string s = sub.toStdString();
+            s.erase(remove_if(s.begin(), s.end(), [](unsigned char c) { return (c < 32);}), s.end());
+            sub = s;
+            if(!sub.isEmpty()) {
+                breakCursorFlashing = true;
+                std::u32string u32sub = sub.toUtf32();
+                u32.insert(m_cursorPosition, u32sub);
+                m_cursorPosition += u32sub.size();
+                setText(TString::fromUtf32(u32));// for password •●●
+                recalcCursor();
+            }
+        }
+
+        if(breakCursorFlashing) {
+            m_cursorVisible = true;
+        } else {
+            m_cursorBlinkCurrent += Timer::deltaTime();
+            if(m_cursorBlinkCurrent >= m_cursorBlinkRate) {
+                m_cursorBlinkCurrent = 0.0f;
+                m_cursorVisible = !m_cursorVisible;
+            }
+        }
+    } else {
+        if(m_focused) {
+            emitSignal(_SIGNAL(focusOut()));
+            m_focused = false;
+            m_cursorVisible = false;
+        }
+    }
+
+    bool hover = rectTransform()->isHovered(pos.x, pos.y);
+    if(m_hovered != hover) {
+        m_currentFade = 0.0f;
+        m_hovered = hover;
+    }
+
+    if(m_hovered) {
+        color = m_highlightedColor;
+
+        if(!m_focused && (Input::isMouseButtonDown(0) || (Input::touchCount() > 0 && Input::touchState(0) == Input::TOUCH_BEGAN))) {
+            m_currentFade = 0.0f;
+
+            Widget::setFocusWidget(this);
+
+            emitSignal(_SIGNAL(focusIn()));
+            m_focused = true;
+        }
+
+        if(Input::isMouseButtonUp(0)) {
+            m_currentFade = 0.0f;
+        }
+
+        if(Input::isMouseButton(Input::MOUSE_LEFT) || Input::touchCount() > 0) {
+            color = m_pressedColor;
+        }
+    }
+
+    if(m_currentFade < 1.0f) {
+        m_currentFade += 1.0f / m_fadeDuration * Timer::deltaTime();
+        m_currentFade = CLAMP(m_currentFade, 0.0f, 1.0f);
+
+        setColor(MIX(m_backgroundColor, color, m_currentFade));
+    }
+
+    Widget::update();
+}
+/*!
+    \internal
+    Overrides the composeComponent method to create the text input component.
+*/
+void LineEdit::composeComponent() {
+    Widget::composeComponent();
+
+    // Add label
+    Actor *text = Engine::composeActor(gLabelClass, gText, actor());
+    Label *label = text->getComponent<Label>();
+    label->setAlign(Alignment::Middle | Alignment::Left);
+
+    RectTransform *labelRect = label->rectTransform();
+    labelRect->setSize(Vector2());
+    labelRect->setAnchors(Vector2(0.0f), Vector2(1.0f));
+
+    setSubWidget(label);
+    setText("");
+
+    RectTransform *rect = rectTransform();
+    rect->setSize(Vector2(100.0f, 30.0f));
+    rect->setPadding(Vector4(2.0f));
+
+    setColor(m_normalColor);
+    recalcCursor();
+}
+/*!
+    \internal
+    Recalculates the cursor position based on the current text and adjusts the label accordingly.
+*/
+void LineEdit::recalcCursor() {
+    Label *label = static_cast<Label *>(subWidget(gText));
+    if(label) {
+        RectTransform *r = label->rectTransform();
+        float pos = (m_cursorPosition > 0) ? label->cursorAt(m_cursorPosition).x : 0.0f;
+
+        m_cursorTransform[12] = pos + rectTransform()->padding().w;
+        m_cursorTransform[13] = rectTransform()->size().y * 0.5f;
+
+        float x = r->position().x;
+        float size = r->size().x;
+        float gap = pos + x;
+        if(gap > size) {
+            r->setPosition(Vector3(size - pos, 0.0f, 0.0f));
+        } else if(gap < 0.0f) {
+            r->setPosition(Vector3(x - gap, 0.0f, 0.0f));
+        }
+        m_cursorTransform[12] += r->position().x;
+    }
+}
diff --git a/modules/uikit/src/components/menu.cpp b/modules/uikit/src/components/menu.cpp
index 836a29274..b8eae25d6 100644
--- a/modules/uikit/src/components/menu.cpp
+++ b/modules/uikit/src/components/menu.cpp
@@ -76,7 +76,7 @@ Frame *Menu::selected() const {
     Sets the selection \a frame for the menu;
 */
 void Menu::setSelected(Frame *frame) {
-    setSubWidget(gSelected, frame);
+    setSubWidget(frame);
 }
 /*!
     Returns the title of the menu.
@@ -181,7 +181,7 @@ void Menu::composeComponent() {
         r->setLayout(layout);
     }
 
-    Actor *actor = Engine::composeActor(gFrame, gFrame, Menu::actor());
+    Actor *actor = Engine::composeActor(gFrame, gSelected, Menu::actor());
     Frame *select = static_cast<Frame *>(actor->component(gFrame));
     select->setColor(Vector4(0.01f, 0.6f, 0.89f, 1.0f));
     select->setCorners(0.0f);
diff --git a/modules/uikit/src/components/progressbar.cpp b/modules/uikit/src/components/progressbar.cpp
index 289e2f72b..b12f77566 100644
--- a/modules/uikit/src/components/progressbar.cpp
+++ b/modules/uikit/src/components/progressbar.cpp
@@ -24,11 +24,23 @@ namespace  {
 ProgressBar::ProgressBar() :
         m_backgroundColor(0.5f, 0.5f, 0.5f, 1.0f),
         m_progressColor(1.0f, 1.0f, 1.0f, 1.0f),
+        m_orientation(Horizontal),
         m_from(0.0f),
         m_to(1.0f),
         m_value(0.0f) {
 
 }
+int ProgressBar::orientation() const {
+    return m_orientation;
+}
+
+void ProgressBar::setOrientation(int orientation) {
+    if(m_orientation != orientation) {
+        m_orientation = orientation;
+
+        recalcProgress();
+    }
+}
 /*!
     Returns the minimum value of the progress range.
 */
@@ -39,9 +51,11 @@ float ProgressBar::from() const {
     Sets the minimum \a value of the progress range.
 */
 void ProgressBar::setFrom(float value) {
-    m_from = value;
+    if(m_from != value) {
+        m_from = value;
 
-    recalcProgress();
+        recalcProgress();
+    }
 }
 /*!
     Returns the maximum value of the progress range.
@@ -53,9 +67,11 @@ float ProgressBar::to() const {
     Sets the maximum \a value of the progress range.
 */
 void ProgressBar::setTo(float value) {
-    m_to = value;
+    if(m_to != value) {
+        m_to = value;
 
-    recalcProgress();
+        recalcProgress();
+    }
 }
 /*!
     Returns the current progress value.
@@ -67,9 +83,11 @@ float ProgressBar::value() const {
     Sets the current progress \a value.
 */
 void ProgressBar::setValue(float value) {
-    m_value = value;
+    if(m_value != value) {
+        m_value = value;
 
-    recalcProgress();
+        recalcProgress();
+    }
 }
 /*!
     Returns the frame representing the progress chunk.
@@ -81,7 +99,7 @@ Frame *ProgressBar::chunk() const {
     Sets the \a frame representing the progress chunk.
 */
 void ProgressBar::setChunk(Frame *frame) {
-    setSubWidget(gChunk, frame);
+    setSubWidget(frame);
 
     if(frame) {
         connect(frame, _SIGNAL(destroyed()), this, _SLOT(onReferenceDestroyed()));
@@ -98,7 +116,7 @@ Frame *ProgressBar::background() const {
     Sets the \a frame representing the background.
 */
 void ProgressBar::setBackground(Frame *frame) {
-    setSubWidget(gBackground, frame);
+    setSubWidget(frame);
 
     if(frame) {
         frame->setColor(m_backgroundColor);
@@ -156,7 +174,10 @@ void ProgressBar::composeComponent() {
     Frame *progressFrame = static_cast<Frame *>(progress->component(gFrame));
     progressFrame->setColor(m_progressColor);
     progressFrame->setBorderColor(0.0f);
-    progressFrame->rectTransform()->setMinAnchors(Vector2(0.0f, 0.0f));
+
+    RectTransform *progressRect = progressFrame->rectTransform();
+    progressRect->setMinAnchors(Vector2(0.0f, 0.0f));
+    progressRect->setSize(Vector2());
 
     setChunk(progressFrame);
 
@@ -169,8 +190,16 @@ void ProgressBar::composeComponent() {
     Recalculates the progress based on the current values.
 */
 void ProgressBar::recalcProgress() {
-    Frame *chunk = ProgressBar::chunk();
-    if(chunk) {
-        chunk->rectTransform()->setMaxAnchors(Vector2(CLAMP((m_from - m_value) / (m_from - m_to), 0.0f, 1.0f), 1.0f));
+    Frame *progressFrame = ProgressBar::chunk();
+    if(progressFrame) {
+        float factor = CLAMP(m_value / (m_to - m_from), 0.0f, 1.0f);
+
+        RectTransform *progressRect = progressFrame->rectTransform();
+        if(m_orientation == Horizontal) {
+            progressRect->setMaxAnchors(Vector2(factor, 1.0f));
+        } else {
+            progressRect->setMaxAnchors(Vector2(1.0f, factor));
+        }
+        progressRect->setSize(Vector2());
     }
 }
diff --git a/modules/uikit/src/components/recttransform.cpp b/modules/uikit/src/components/recttransform.cpp
index fb16689e8..939402b9e 100644
--- a/modules/uikit/src/components/recttransform.cpp
+++ b/modules/uikit/src/components/recttransform.cpp
@@ -402,6 +402,14 @@ Vector2 RectTransform::sizeHint() const {
     return Vector2();
 }
 
+Vector4 RectTransform::scissorArea() const {
+    cleanDirty();
+    return Vector4(m_worldTransform[12] + m_padding.w,
+                   m_worldTransform[13] + m_padding.x,
+                   m_size.x * m_worldScale.x - (m_padding.y + m_padding.w),
+                   m_size.y * m_worldScale.y - (m_padding.x + m_padding.z));
+}
+
 void RectTransform::recalcParent() {
     if(m_layout) {
         Vector2 oldSize(m_size);
diff --git a/modules/uikit/src/components/slider.cpp b/modules/uikit/src/components/slider.cpp
new file mode 100644
index 000000000..545a77309
--- /dev/null
+++ b/modules/uikit/src/components/slider.cpp
@@ -0,0 +1,183 @@
+#include "components/slider.h"
+
+#include "components/progressbar.h"
+#include "components/recttransform.h"
+
+#include <timer.h>
+#include <input.h>
+
+namespace {
+    const char *gBackground("background");
+    const char *gKnob("knob");
+
+    const char *gProgressBarClass("ProgressBar");
+    const char *gFrameClass("Frame");
+
+    const float gFadeDuration = 0.2f;
+}
+
+Slider::Slider() :
+        m_normalColor(0.008f, 0.467f, 0.741f, 1.0f),
+        m_highlightedColor(0.0078f, 0.533f, 0.819f, 1.0f) {
+
+}
+
+void Slider::update() {
+    Vector4 pos = Input::mousePosition();
+    if(Input::touchCount() > 0) {
+        pos = Input::touchPosition(0);
+    }
+
+    RectTransform *rect = rectTransform();
+
+    bool hover = rect->isHovered(pos.x, pos.y);
+    if(m_hovered != hover) {
+        m_currentFade = 0.0f;
+        m_hovered = hover;
+    }
+
+    Vector4 color(m_normalColor);
+
+    if(m_hovered) {
+        color = Vector4(m_highlightedColor);
+
+        if(Input::isMouseButtonDown(Input::MOUSE_LEFT) || (Input::touchCount() > 0 && Input::touchState(0) == Input::TOUCH_BEGAN)) {
+            m_currentFade = 0.0f;
+
+            Widget::setFocusWidget(this);
+
+            emitSignal(_SIGNAL(pressed()));
+        }
+
+        if(Input::isMouseButton(Input::MOUSE_LEFT) || Input::touchCount() > 0) {
+            Vector3 min, max;
+            rect->bound().box(min, max);
+            Vector2 local(Vector2(pos.x, pos.y) - min);
+            Vector2 factor(local.x / (max.x - min.x), local.y / (max.y - min.y));
+
+            float f = (m_orientation == Horizontal) ? factor.x : factor.y;
+            int newValue = round(MIX(m_minimum, m_maximum, f));
+            if(newValue != m_value) {
+                setValue(newValue);
+
+                emitSignal(_SIGNAL(valueChanged(int)), newValue);
+            }
+        }
+    }
+
+    if(m_currentFade < 1.0f) {
+        m_currentFade += 1.0f / gFadeDuration * Timer::deltaTime();
+        m_currentFade = CLAMP(m_currentFade, 0.0f, 1.0f);
+
+        ProgressBar *bar = background();
+        if(bar) {
+            bar->setProgressColor(MIX(bar->progressColor(), color, m_currentFade));
+        }
+    }
+}
+
+ProgressBar *Slider::background() const {
+    return static_cast<ProgressBar *>(subWidget(gBackground));
+}
+
+void Slider::setBackground(ProgressBar *background) {
+    setSubWidget(background);
+
+    if(background) {
+        background->setFrom(m_minimum);
+        background->setTo(m_maximum);
+        background->setValue(m_value);
+    }
+}
+
+void Slider::setValue(int value) {
+    AbstractSlider::setValue(value);
+
+    Widget *knob = AbstractSlider::knob();
+    if(knob) {
+        float factor = value != 0 ? static_cast<float>(value) / static_cast<float>(m_maximum-m_minimum) : 0.0f;
+        factor = CLAMP(factor, 0.0f, 1.0f);
+        if(m_orientation == Horizontal) {
+            knob->rectTransform()->setAnchors(Vector2(factor, 0.5f), Vector2(factor, 0.5f));
+        } else {
+            knob->rectTransform()->setAnchors(Vector2(0.5f, factor), Vector2(0.5f, factor));
+        }
+    }
+
+    ProgressBar *bar = background();
+    if(bar) {
+        bar->setValue(value);
+    }
+}
+
+void Slider::setMinimum(int value) {
+    AbstractSlider::setMinimum(value);
+
+    ProgressBar *bar = background();
+    if(bar) {
+        bar->setFrom(value);
+    }
+}
+
+void Slider::setMaximum(int value) {
+    AbstractSlider::setMaximum(value);
+
+    ProgressBar *bar = background();
+    if(bar) {
+        bar->setTo(value);
+    }
+}
+
+void Slider::setOrientation(int value) {
+    AbstractSlider::setOrientation(value);
+
+    ProgressBar *bar = background();
+    if(bar) {
+        bar->setOrientation(value);
+
+        RectTransform *rectBar = bar->rectTransform();
+        if(m_orientation == Horizontal) {
+            rectBar->setSize(Vector2(0.0f, 10.0f));
+            rectBar->setAnchors(Vector2(0.0f, 0.5f), Vector2(1.0f, 0.5f));
+        } else {
+            rectBar->setSize(Vector2(10.0f, 0.0f));
+            rectBar->setAnchors(Vector2(0.5f, 0.0f), Vector2(0.5f, 1.0f));
+        }
+    }
+
+    setValue(m_value);
+}
+
+void Slider::composeComponent() {
+    AbstractSlider::composeComponent();
+
+    // Add background
+    Actor *barActor = Engine::composeActor(gProgressBarClass, gBackground, actor());
+    ProgressBar *bar = barActor->getComponent<ProgressBar>();
+    bar->setValue(m_value);
+    bar->setProgressColor(m_normalColor);
+
+    setBackground(bar);
+
+    setOrientation(Horizontal);
+
+    // Add knob
+    Actor *knobActor = Engine::composeActor(gFrameClass, gKnob, actor());
+    Frame *knob = knobActor->getComponent<Frame>();
+    knob->setCorners(Vector4(8.0f));
+    knob->setColor(Vector4(1.0f));
+
+    RectTransform *rectKnob = knob->rectTransform();
+    rectKnob->setSize(Vector2(16.0f, 16.0f));
+    rectKnob->setAnchors(Vector2(0.5f), Vector2(0.5f));
+
+    setKnob(knob);
+
+    setValue(m_value);
+
+    if(m_orientation == Horizontal) {
+        rectTransform()->setSize(Vector2(100.0f, 20.0f));
+    } else {
+        rectTransform()->setSize(Vector2(20.0f, 100.0f));
+    }
+}
diff --git a/modules/uikit/src/components/switch.cpp b/modules/uikit/src/components/switch.cpp
index 6416031e6..d717e64cd 100644
--- a/modules/uikit/src/components/switch.cpp
+++ b/modules/uikit/src/components/switch.cpp
@@ -11,7 +11,9 @@
 #include <timer.h>
 
 namespace  {
-    const char *gKnob = "knob";
+    const char *gKnob("knob");
+
+    const char *gFrameClass("Frame");
 }
 
 /*!
@@ -53,7 +55,7 @@ Frame *Switch::knobGraphic() const {
     Sets the graphical \a knob component.
 */
 void Switch::setKnobGraphic(Frame *knob) {
-    setSubWidget(gKnob, knob);
+    setSubWidget(knob);
 
     if(knob) {
         connect(knob, _SIGNAL(destroyed()), this, _SLOT(onReferenceDestroyed()));
@@ -156,7 +158,7 @@ void Switch::composeComponent() {
         }
 
         // Add knob
-        Actor *knob = Engine::composeActor("Frame", "Knob", background()->actor());
+        Actor *knob = Engine::composeActor(gFrameClass, gKnob, background()->actor());
         Frame *frame = knob->getComponent<Frame>();
         frame->setCorners(background()->corners());
         setKnobGraphic(frame);
diff --git a/modules/uikit/src/components/textinput.cpp b/modules/uikit/src/components/textinput.cpp
deleted file mode 100644
index 546108216..000000000
--- a/modules/uikit/src/components/textinput.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-#include "components/textinput.h"
-
-#include "components/label.h"
-#include "components/frame.h"
-#include "components/recttransform.h"
-
-#include <components/actor.h>
-#include <components/textrender.h>
-
-#include <resources/mesh.h>
-#include <resources/font.h>
-
-#include <input.h>
-#include <timer.h>
-
-#include <algorithm>
-
-namespace {
-    const char *gBackground("background");
-    const char *gCursor("cursor");
-    const char *gText("text");
-
-    const char *gLabelClass("Label");
-    const char *gFrameClass("Frame");
-}
-
-/*!
-    \class TextInput
-    \brief The TextInput class is a UI component that allows users to input text.
-    \inmodule Gui
-
-    The TextInput class provides a user interface for text input, supporting text editing, cursor positioning, and input handling.
-    It inherits functionality from the Widget class and extends it to handle text-related features and animations.
-*/
-
-TextInput::TextInput() :
-        m_normalColor(0.5f, 0.5f, 0.5f, 1.0f),
-        m_highlightedColor(0.6f, 0.6f, 0.6f, 1.0f),
-        m_pressedColor(0.7f, 0.7f, 0.7f, 1.0f),
-        m_textColor(1.0f, 1.0f, 1.0f, 1.0f),
-        m_cursorPosition(0),
-        m_fadeDuration(0.2f),
-        m_currentFade(1.0f),
-        m_cursorBlinkRate(0.85f),
-        m_cursorBlinkCurrent(0.0f),
-        m_hovered(false),
-        m_focused(false) {
-}
-/*!
-    Returns the current text entered into the TextInput.
-*/
-TString TextInput::text() const {
-    Label *label = TextInput::textComponent();
-    if(label) {
-        return label->text();
-    }
-
-    return TString();
-}
-/*!
-    Sets the \a text in the TextInput.
-*/
-void TextInput::setText(const TString text) {
-    Label *label = TextInput::textComponent();
-    if(label) {
-        label->setText(text);
-        std::u32string u32 = text.toUtf32();
-        m_cursorPosition = u32.size();
-        recalcCursor();
-    }
-}
-/*!
-    Returns the color of the text.
-*/
-Vector4 TextInput::textColor() const {
-    return m_textColor;
-}
-/*!
-    Sets the \a color of the text.
-*/
-void TextInput::setTextColor(Vector4 color) {
-    m_textColor = color;
-
-    Label *label = TextInput::textComponent();
-    if(label) {
-        label->setColor(m_textColor);
-    }
-
-    Label *cursor = TextInput::textCursor();
-    if(cursor) {
-        cursor->setColor(m_textColor);
-    }
-}
-/*!
-    Returns the color of the background.
-*/
-Vector4 TextInput::backgroundColor() const {
-    return m_normalColor;
-}
-/*!
-    Sets the \a color of the background.
-*/
-void TextInput::setBackgroundColor(Vector4 color) {
-    m_normalColor = color;
-
-    Frame *background = TextInput::background();
-    if(background) {
-        background->setColor(m_normalColor);
-    }
-}
-/*!
-    Returns the color of the background in hover state.
-*/
-Vector4 TextInput::hoverColor() const {
-    return m_highlightedColor;
-}
-/*!
-    Sets the \a color of the background in hover state.
-*/
-void TextInput::setHoverColor(Vector4 color) {
-    m_highlightedColor = color;
-}
-/*!
-    Returns the color of the background in pressed state.
-*/
-Vector4 TextInput::pressedColor() const {
-    return m_pressedColor;
-}
-/*!
-    Sets the \a color of the background in pressed state.
-*/
-void TextInput::setPressedColor(Vector4 color) {
-    m_pressedColor = color;
-}
-/*!
-    Returns the text label component.
-*/
-Label *TextInput::textComponent() const {
-    return static_cast<Label *>(subWidget(gText));
-}
-/*!
-    Sets the text \a label component.
-*/
-void TextInput::setTextComponent(Label *label) {
-    setSubWidget(gText, label);
-}
-/*!
-    Returns the text cursor component.
-*/
-Label *TextInput::textCursor() const {
-    return static_cast<Label *>(subWidget(gCursor));
-}
-/*!
-    Sets the text \a cursor component.
-*/
-void TextInput::setTextCursor(Label *cursor) {
-    setSubWidget(gCursor, cursor);
-}
-/*!
-    Returns the background frame component.
-*/
-Frame *TextInput::background() const {
-    return static_cast<Frame *>(subWidget(gBackground));
-}
-/*!
-    Sets the background \a frame component.
-*/
-void TextInput::TextInput::setBackground(Frame *frame) {
-    setSubWidget(gBackground, frame);
-}
-/*!
-    \internal
-    Overrides the update method to handle text input and cursor animation.
-*/
-void TextInput::update() {
-    Vector4 pos = Input::mousePosition();
-    if(Input::touchCount() > 0) {
-        pos = Input::touchPosition(0);
-    }
-    Vector4 color(m_normalColor);
-
-    if(Widget::focusWidget() == this) {
-        m_cursorBlinkCurrent += Timer::deltaTime();
-        if(m_cursorBlinkCurrent >= m_cursorBlinkRate) {
-            m_cursorBlinkCurrent = 0.0f;
-            Label *cursor = TextInput::textCursor();
-            if(cursor) {
-                cursor->setEnabled(!cursor->isEnabled());
-            }
-        }
-
-        std::u32string u32 = text().toUtf32();
-        bool isBackspace = Input::isKeyDown(Input::KEY_BACKSPACE);
-        if(isBackspace || Input::isKeyDown(Input::KEY_DELETE)) {
-            if(isBackspace && m_cursorPosition >= 0) {
-                m_cursorPosition--;
-            }
-            if(m_cursorPosition >= 0) {
-                u32.erase(m_cursorPosition, 1);
-                setText(TString::fromUtf32(u32));
-            } else {
-                m_cursorPosition = 0;
-            }
-            recalcCursor();
-        } else if(Input::isKeyDown(Input::KEY_LEFT) && m_cursorPosition > 0) {
-            m_cursorPosition--;
-            recalcCursor();
-        } else if(Input::isKeyDown(Input::KEY_RIGHT) && m_cursorPosition < u32.size()) {
-            m_cursorPosition++;
-            recalcCursor();
-        } else if(Input::isKeyDown(Input::KEY_ENTER) || Input::isKeyDown(Input::KEY_KP_ENTER)) {
-            emitSignal(_SIGNAL(editingFinished()));
-        } else {
-            TString sub = Input::inputString();
-            std::string s = sub.toStdString();
-            s.erase(remove_if(s.begin(), s.end(), [](unsigned char c) { return (c < 32);}), s.end());
-            sub = s;
-            if(!sub.isEmpty()) {
-                std::u32string u32sub = sub.toUtf32();
-                u32.insert(m_cursorPosition, u32sub);
-                m_cursorPosition += u32sub.size();
-                setText(TString::fromUtf32(u32));
-                recalcCursor();
-            }
-        }
-    } else {
-        if(m_focused) {
-            emitSignal(_SIGNAL(focusOut()));
-            m_focused = false;
-
-            Label *cursor = TextInput::textCursor();
-            if(cursor) {
-                cursor->setEnabled(false);
-            }
-        }
-    }
-
-    bool hover = rectTransform()->isHovered(pos.x, pos.y);
-    if(m_hovered != hover) {
-        m_currentFade = 0.0f;
-        m_hovered = hover;
-    }
-
-    if(m_hovered) {
-        color = m_highlightedColor;
-
-        if(!m_focused && (Input::isMouseButtonDown(0) || (Input::touchCount() > 0 && Input::touchState(0) == Input::TOUCH_BEGAN))) {
-            m_currentFade = 0.0f;
-
-            Widget::setFocusWidget(this);
-
-            Label *cursor = TextInput::textCursor();
-            if(cursor) {
-                cursor->setEnabled(true);
-            }
-            emitSignal(_SIGNAL(focusIn()));
-            m_focused = true;
-        }
-
-        if(Input::isMouseButtonUp(0)) {
-            m_currentFade = 0.0f;
-        }
-
-        if(Input::isMouseButton(Input::MOUSE_LEFT) || Input::touchCount() > 0) {
-            color = m_pressedColor;
-        }
-    }
-
-    if(m_currentFade < 1.0f) {
-        m_currentFade += 1.0f / m_fadeDuration * Timer::deltaTime();
-        m_currentFade = CLAMP(m_currentFade, 0.0f, 1.0f);
-
-        Frame *background = TextInput::background();
-        if(background) {
-            background->setColor(MIX(background->color(), color, m_currentFade));
-        }
-    }
-
-    Widget::update();
-}
-/*!
-    \internal
-    Overrides the composeComponent method to create the text input component.
-*/
-void TextInput::composeComponent() {
-    Widget::composeComponent();
-
-    // Add Background
-    Actor *background = Engine::composeActor(gFrameClass, gBackground, actor());
-    Frame *backgroundFrame = background->getComponent<Frame>();
-    backgroundFrame->setColor(m_normalColor);
-    backgroundFrame->rectTransform()->setAnchors(Vector2(0.0f), Vector2(1.0f));
-
-    setBackground(backgroundFrame);
-
-    // Add label
-    Actor *text = Engine::composeActor(gLabelClass, gLabelClass, background);
-    Label *label = text->getComponent<Label>();
-    label->setAlign(Alignment::Middle | Alignment::Left);
-    float corners = backgroundFrame->corners().x;
-
-    RectTransform *labelRect = label->rectTransform();
-    labelRect->setSize(Vector2());
-    labelRect->setMargin(Vector4(0.0, corners, 0.0f, corners));
-    labelRect->setAnchors(Vector2(0.0f), Vector2(1.0f));
-
-    setTextComponent(label);
-    setText("");
-
-    // Add cursor
-    Actor *cursorActor = Engine::composeActor(gLabelClass, gLabelClass, text);
-    Label *cursor = cursorActor->getComponent<Label>();
-    cursor->setAlign(Alignment::Middle | Alignment::Left);
-    cursor->setColor(m_textColor);
-    cursor->setText("|");
-
-    setTextCursor(cursor);
-
-    RectTransform *rect = cursor->rectTransform();
-    rect->setSize(Vector2(corners, 0)); // corners should be replaced with width of cursor glyph
-    rect->setAnchors(Vector2(0.0f, 0.0f), Vector2(0.0f, 1.0f));
-
-    rectTransform()->setSize(Vector2(100.0f, 30.0f));
-
-    recalcCursor();
-}
-/*!
-    \internal
-    Recalculates the cursor position based on the current text and adjusts the label accordingly.
-*/
-void TextInput::recalcCursor() {
-    Label *cursor = TextInput::textCursor();
-    Label *label = TextInput::textComponent();
-    if(label && cursor) {
-        Vector2 pos = label->cursorAt(m_cursorPosition);
-        float corner = 0.0f;
-
-        Frame *background = TextInput::background();
-        if(background) {
-            corner = background->corners().x;
-        }
-
-        cursor->rectTransform()->setPosition(Vector3(pos.x, -corner, 0.0f));
-
-        float x = label->rectTransform()->position().x;
-        float size = label->rectTransform()->size().x;
-        float gap = pos.x + x;
-        if(gap > size) {
-            float shift = size - pos.x;
-            label->rectTransform()->setPosition(Vector3(shift, 0.0f, 0.0f));
-            label->setClipOffset(Vector2(-shift, 0.0f));
-        } else if(gap < 0.0f) {
-            float shift = x - gap;
-            label->rectTransform()->setPosition(Vector3(shift, 0.0f, 0.0f));
-            label->setClipOffset(Vector2(-shift, 0.0f));
-        }
-    }
-}
diff --git a/modules/uikit/src/components/toolbutton.cpp b/modules/uikit/src/components/toolbutton.cpp
index a02b69498..46c83244f 100644
--- a/modules/uikit/src/components/toolbutton.cpp
+++ b/modules/uikit/src/components/toolbutton.cpp
@@ -48,7 +48,7 @@ Menu *ToolButton::menu() const {
     Ownership of the menu is not transferred to the tool button.
 */
 void ToolButton::setMenu(Menu *menu) {
-    setSubWidget(gMenuFrame, menu);
+    setSubWidget(menu);
 
     if(menu) {
         connect(menu, _SIGNAL(aboutToHide()), this, _SLOT(hideMenu()));
@@ -117,7 +117,7 @@ void ToolButton::composeComponent() {
         t->setPivot(Vector2(1.0f, 0.5f));
     }
 
-    Actor *actor = Engine::composeActor(gMenu, gMenu, ToolButton::actor());
+    Actor *actor = Engine::composeActor(gMenu, gMenuFrame, ToolButton::actor());
     Menu *menu = static_cast<Menu *>(actor->component(gMenu));
 
     setMenu(menu);
diff --git a/modules/uikit/src/components/widget.cpp b/modules/uikit/src/components/widget.cpp
index 279f9b424..bc9c1c904 100644
--- a/modules/uikit/src/components/widget.cpp
+++ b/modules/uikit/src/components/widget.cpp
@@ -8,9 +8,6 @@
 
 #include <components/actor.h>
 
-#include <commandbuffer.h>
-#include <gizmos.h>
-
 Widget *Widget::m_focusWidget = nullptr;
 
 /*!
@@ -43,7 +40,7 @@ Widget::~Widget() {
     static_cast<UiSystem *>(system())->removeWidget(this);
 }
 /*!
-    Sets a textual description of widget style.
+    Returns a textual description of widget style.
 */
 TString Widget::style() const {
     TString result;
@@ -73,7 +70,24 @@ void Widget::addClass(const TString &name) {
     Internal method called to draw the widget using the provided command buffer.
 */
 void Widget::draw(CommandBuffer &buffer) {
-    A_UNUSED(buffer);
+    drawSub(buffer);
+
+    for(auto it : m_childWidgets) {
+        if(it->actor()->isEnabled() && it->isEnabled()) {
+            it->draw(buffer);
+        }
+    }
+}
+/*!
+    \internal
+    Internal method called to draw the sub widget using the provided command buffer.
+*/
+void Widget::drawSub(CommandBuffer &buffer) {
+    for(auto it : m_subWidgets) {
+        if(it && it->actor()->isEnabled() && it->isEnabled()) {
+            it->draw(buffer);
+        }
+    }
 }
 /*!
     Lowers the widget to the bottom of the widget's stack.
@@ -196,13 +210,16 @@ void Widget::applyStyle() {
         }
     }
 
-    // Child widgets
-    for(auto it : childWidgets()) {
+    for(auto it : m_childWidgets) {
         if(layout) {
             layout->addTransform(it->rectTransform());
         }
         it->applyStyle();
     }
+
+    for(auto it : m_subWidgets) {
+        it->applyStyle();
+    }
 }
 /*!
     Returns the parent Widget.
@@ -213,12 +230,8 @@ Widget *Widget::parentWidget() const {
 /*!
     Returns a list of child widgets;
 */
-std::list<Widget *> Widget::childWidgets() const {
-    std::list<Widget *> result;
-    for(auto it : actor()->componentsInChild("Widget")) {
-        result.push_back(static_cast<Widget *>(it));
-    }
-    return result;
+std::list<Widget *> &Widget::childWidgets() {
+    return m_childWidgets;
 }
 /*!
     Returns RectTransform component attached to parent Actor.
@@ -231,7 +244,7 @@ RectTransform *Widget::rectTransform() const {
 */
 bool Widget::isSubWidget(Widget *widget) const {
     for(auto it : m_subWidgets) {
-        if(it.second == widget) {
+        if(it == widget) {
             return true;
         }
     }
@@ -245,19 +258,28 @@ Widget *Widget::focusWidget() {
 }
 
 Widget *Widget::subWidget(const TString &name) const {
-    auto it = m_subWidgets.find(name);
-    if(it != m_subWidgets.end()) {
-        return it->second;
+    for(auto it : m_subWidgets) {
+        if(it->actor()->name() == name) {
+            return it;
+        }
     }
     return nullptr;
 }
 
-void Widget::setSubWidget(const TString &name, Widget *widget) {
-    Widget *current = subWidget(name);
+void Widget::setSubWidget(Widget *widget) {
+    Widget *current = subWidget(widget->actor()->name());
     if(current != widget) {
-        disconnect(current, _SIGNAL(destroyed()), this, _SLOT(onReferenceDestroyed()));
-        m_subWidgets[name] = widget;
+        if(current) {
+            m_subWidgets.remove(current);
+            m_childWidgets.push_back(current);
+
+            disconnect(current, _SIGNAL(destroyed()), this, _SLOT(onReferenceDestroyed()));
+        }
+
         if(widget) {
+            m_subWidgets.push_back(widget);
+            m_childWidgets.remove(widget);
+
             connect(widget, _SIGNAL(destroyed()), this, _SLOT(onReferenceDestroyed()));
         }
     }
@@ -297,13 +319,11 @@ void Widget::setParent(Object *parent, int32_t position, bool force) {
     Internal slot method called when a referenced object is destroyed.
 */
 void Widget::onReferenceDestroyed() {
-    Object *object = sender();
+    Widget *widget = dynamic_cast<Widget *>(sender());
 
-    for(auto it : m_subWidgets) {
-        if(it.second == object) {
-            m_subWidgets.erase(it.first);
-            break;
-        }
+    if(widget) {
+        m_childWidgets.remove(widget);
+        m_subWidgets.remove(widget);
     }
 }
 /*!
@@ -317,7 +337,14 @@ void Widget::actorParentChanged() {
 
         object = dynamic_cast<Actor *>(object->parent());
         if(object) {
-            m_parent = static_cast<Widget *>(object->component("Widget"));
+            if(m_parent) {
+                m_parent->m_childWidgets.remove(this);
+            }
+
+            m_parent = object->getComponent<Widget>();
+            if(m_parent) {
+                m_parent->m_childWidgets.push_back(this);
+            }
         }
     }
 }
@@ -368,7 +395,7 @@ void Widget::addStyleRules(const std::map<TString, TString> &rules, uint32_t wei
     }
 
     for(auto it : m_subWidgets) {
-        it.second->addStyleRules(rules, weight);
+        it->addStyleRules(rules, weight);
     }
 }
 /*!
diff --git a/modules/uikit/src/pipelinetasks/guilayer.cpp b/modules/uikit/src/pipelinetasks/guilayer.cpp
index bab9a6d40..e6a5de32f 100644
--- a/modules/uikit/src/pipelinetasks/guilayer.cpp
+++ b/modules/uikit/src/pipelinetasks/guilayer.cpp
@@ -50,11 +50,13 @@ void GuiLayer::exec() {
     buffer->setViewProjection(v, Matrix4::ortho(0, m_width, 0, m_height, 0.0f, 100.0f));
 
     for(auto it : m_uiComponents) {
-        if(it->parentWidget() == nullptr && it->rectTransform()) {
+        if(it->parentWidget() == nullptr && it->rectTransform()) { // Root widget
             it->rectTransform()->setSize(buffer->viewport());
-        }
 
-        it->draw(*buffer);
+            it->draw(*buffer);
+
+            break;
+        }
     }
 
     buffer->endDebugMarker();
diff --git a/modules/uikit/src/uikit.cpp b/modules/uikit/src/uikit.cpp
index 8dca4230e..ac0936ece 100644
--- a/modules/uikit/src/uikit.cpp
+++ b/modules/uikit/src/uikit.cpp
@@ -29,8 +29,11 @@ static const char *meta = \
 "   \"components\": ["
 "       \"AbstractButton\","
 "       \"Button\","
+"       \"CheckBox\","
 "       \"FloatInput\","
+"       \"Foldout\","
 "       \"Frame\","
+"       \"Image\","
 "       \"Label\","
 "       \"Menu\","
 "       \"ProgressBar\","
@@ -38,6 +41,7 @@ static const char *meta = \
 "       \"Switch\","
 "       \"TextInput\","
 "       \"ToolButton\","
+"       \"UiLoader\","
 "       \"Widget\""
 "   ]"
 "}";
diff --git a/modules/uikit/src/uisystem.cpp b/modules/uikit/src/uisystem.cpp
index c4f6401d8..2909ab313 100644
--- a/modules/uikit/src/uisystem.cpp
+++ b/modules/uikit/src/uisystem.cpp
@@ -14,11 +14,12 @@
 #include "components/progressbar.h"
 #include "components/frame.h"
 #include "components/menu.h"
-#include "components/textinput.h"
+#include "components/lineedit.h"
 #include "components/floatinput.h"
 #include "components/toolbutton.h"
 #include "components/foldout.h"
 #include "components/uiloader.h"
+#include "components/slider.h"
 
 #include "pipelinetasks/guilayer.h"
 
@@ -45,10 +46,12 @@ UiSystem::UiSystem() :
     CheckBox::registerClassFactory(this);
 
     ProgressBar::registerClassFactory(this);
+    AbstractSlider::registerClassFactory(this);
+    Slider::registerClassFactory(this);
 
     Menu::registerClassFactory(this);
 
-    TextInput::registerClassFactory(this);
+    LineEdit::registerClassFactory(this);
     FloatInput::registerClassFactory(this);
 
     ToolButton::registerClassFactory(this);
@@ -80,7 +83,7 @@ UiSystem::~UiSystem() {
 
     Menu::unregisterClassFactory(this);
 
-    TextInput::unregisterClassFactory(this);
+    LineEdit::unregisterClassFactory(this);
     FloatInput::unregisterClassFactory(this);
 
     ToolButton::unregisterClassFactory(this);
diff --git a/worldeditor/bin/engine/materials/DefaultFont.shader b/worldeditor/bin/engine/materials/DefaultFont.shader
index 0f78c7427..f017beb8a 100644
--- a/worldeditor/bin/engine/materials/DefaultFont.shader
+++ b/worldeditor/bin/engine/materials/DefaultFont.shader
@@ -1,7 +1,6 @@
 <shader version="11">
     <properties>
         <property type="vec4" name="mainColor"/>
-        <property type="vec4" name="clipRect"/>
         <property type="float" name="weight"/>
         <property binding="0" type="texture2d" name="mainTexture"/>
     </properties>
@@ -16,7 +15,7 @@ layout(location = 0) in vec3 vertex;
 layout(location = 1) in vec2 uv0;
 layout(location = 2) in vec4 color;
 
-layout(location = 0) out vec4 _uvMask;
+layout(location = 0) out vec2 _uv;
 layout(location = 1) out vec4 _color;
 layout(location = 2) flat out vec4 _objectId;
 layout(location = 3) flat out int _instanceOffset;
@@ -28,7 +27,7 @@ void main(void) {
 
 #pragma objectId
 
-    _uvMask = vec4(uv0, vertex.xy * 2.0 - clipRect.xy - clipRect.zw);
+    _uv = uv0;
     _color = color * mainColor;
 
     vec4 vertex = g.projection * ((g.view * modelMatrix) * vec4(vertex, 1.0));
@@ -47,7 +46,7 @@ void main(void) {
 
 layout(binding = UNIFORM) uniform sampler2D mainTexture;
 
-layout(location = 0) in vec4 _uvMask;
+layout(location = 0) in vec2 _uv;
 layout(location = 1) in vec4 _color;
 layout(location = 2) flat in vec4 _objectId;
 layout(location = 3) flat in int _instanceOffset;
@@ -62,7 +61,7 @@ void main() {
     float min = 1.0f - weight - softness;
     float max = 1.0f - weight + softness;
 
-    float mask = smoothstep(min, max, texture(mainTexture, _uvMask.xy).x);
+    float mask = smoothstep(min, max, texture(mainTexture, _uv).x);
 
     if(g.clip >= mask) {
         discard;
diff --git a/worldeditor/src/main.cpp b/worldeditor/src/main.cpp
index 0442f783d..9d812bfad 100644
--- a/worldeditor/src/main.cpp
+++ b/worldeditor/src/main.cpp
@@ -13,6 +13,7 @@
 #include <editor/assetmanager.h>
 #include <editor/pluginmanager.h>
 #include <editor/editorsettings.h>
+#include <editor/editorplatform.h>
 
 #include <engine.h>
 
@@ -41,6 +42,12 @@ int main(int argc, char *argv[]) {
         qss.close();
     }
 
+    Log::setLogLevel(Log::DBG);
+    Log::setHandler(new QLog());
+
+    Engine engine(argv[0]);
+    Engine::setPlatformAdaptor(&EditorPlatform::instance());
+
     QString project;
     if(argc > 1) {
         project = QApplication::arguments().at(1);
@@ -60,11 +67,6 @@ int main(int argc, char *argv[]) {
     splash.show();
     app.processEvents();
 
-    Log::setLogLevel(Log::DBG);
-    Log::setHandler(new QLog());
-
-    Engine engine(argv[0]);
-
     MainWindow window(&engine);
 
     splash.finish(&window);
diff --git a/worldeditor/src/screens/projectbrowser/projectbrowser.cpp b/worldeditor/src/screens/projectbrowser/projectbrowser.cpp
index 201118218..91804819d 100644
--- a/worldeditor/src/screens/projectbrowser/projectbrowser.cpp
+++ b/worldeditor/src/screens/projectbrowser/projectbrowser.cpp
@@ -7,6 +7,8 @@
 #include <QKeyEvent>
 #include <QFileDialog>
 
+#include <file.h>
+
 #include "config.h"
 
 ProjectBrowser::ProjectBrowser(QWidget *parent) :
@@ -37,8 +39,8 @@ void ProjectBrowser::onNewProject() {
         if(info.suffix().isEmpty()) {
             m_projectPath += gProjectExt;
         }
-        QFile file(m_projectPath);
-        if(file.open(QIODevice::WriteOnly)) {
+        File file(m_projectPath.toStdString());
+        if(file.open(File::WriteOnly)) {
             file.close();
 
             done(QDialog::Accepted);
diff --git a/worldeditor/src/screens/scenecomposer/scenecomposer.cpp b/worldeditor/src/screens/scenecomposer/scenecomposer.cpp
index a810608aa..38702d588 100644
--- a/worldeditor/src/screens/scenecomposer/scenecomposer.cpp
+++ b/worldeditor/src/screens/scenecomposer/scenecomposer.cpp
@@ -809,10 +809,10 @@ bool SceneComposer::loadScene(const TString &path, bool additive) {
     }
     Engine::resourceSystem()->processEvents();
 
-    QFile file(path.data());
-    if(file.open(QIODevice::ReadOnly)) {
-        QByteArray array = file.readAll();
-        Variant var = Json::load(array.constData());
+    File file(path.data());
+    if(file.open(File::ReadOnly)) {
+        ByteArray array = file.readAll();
+        Variant var = Json::load(array);
         Map *map = dynamic_cast<Map *>(Engine::toObject(var, nullptr));
         if(map) {
             Scene *scene = map->scene();
@@ -840,9 +840,9 @@ void SceneComposer::saveScene(const TString &path, Scene *scene) {
     scene->setParent(map);
     TString data = Json::save(Engine::toVariant(map), 0);
     if(!data.isEmpty()) {
-        QFile file(path.data());
-        if(file.open(QIODevice::WriteOnly)) {
-            file.write(data.data(), data.size());
+        File file(path.data());
+        if(file.open(File::WriteOnly)) {
+            file.write(data);
             file.close();
             scene->setModified(false);
 
@@ -930,9 +930,9 @@ void SceneComposer::onSaveIsolated() {
                 actor->setParent(prefab);
                 TString data = Json::save(Engine::toVariant(prefab), 0);
                 if(!data.isEmpty()) {
-                    QFile file(m_isolationSettings->source().data());
-                    if(file.open(QIODevice::WriteOnly)) {
-                        file.write(data.data(), data.size());
+                    File file(m_isolationSettings->source());
+                    if(file.open(File::WriteOnly)) {
+                        file.write(data);
                         file.close();
                     }
                 }
@@ -945,9 +945,9 @@ void SceneComposer::onSaveIsolated() {
 Prefab *SceneComposer::loadPrefab() {
     Prefab *prefab = nullptr;
     if(Url(m_isolationSettings->source()).suffix() == "fab") {
-        QFile loadFile(m_isolationSettings->source().data());
-        if(loadFile.open(QIODevice::ReadOnly)) {
-            Variant var = Json::load(loadFile.readAll().toStdString());
+        File loadFile(m_isolationSettings->source());
+        if(loadFile.open(File::ReadOnly)) {
+            Variant var = Json::load(loadFile.readAll());
             prefab = dynamic_cast<Prefab *>(Engine::toObject(var));
         }
     } else { // The asset is a mesh