Main goal of this master´s thesis is to propose and implement improvements to an original purely raster version of Flame Painter editor. An enhancement of the undo/redo system with emphasise to its functionality and memory requirements has been implemented. Moreover, the editor was extended by adding an ability to edit brush strokes using vector primitives which effectively assist the user in future stroke editing. This project was created in cooperation with employees of the Escape Motions Company.